ovl: make consistent use of OVL_FS()

Andrea Righi · amir73il · commit f01d08899fd7 · 2023-08-12T19:02:54.000+03:00
Always use OVL_FS() to retrieve the corresponding struct ovl_fs from a
struct super_block.

Reviewed-by: Amir Goldstein &lt;amir73il@gmail.com&gt;
Signed-off-by: Andrea Righi &lt;andrea.righi@canonical.com&gt;
Signed-off-by: Amir Goldstein &lt;amir73il@gmail.com&gt;
diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
@@ -932,7 +932,7 @@ static int ovl_do_copy_up(struct ovl_copy_up_ctx *c)
 static bool ovl_need_meta_copy_up(struct dentry *dentry, umode_t mode,
 				  int flags)
 {
-	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(dentry->d_sb);
 
 	if (!ofs->config.metacopy)
 		return false;
diff --git a/fs/overlayfs/export.c b/fs/overlayfs/export.c
@@ -183,7 +183,7 @@ static int ovl_connect_layer(struct dentry *dentry)
  */
 static int ovl_check_encode_origin(struct dentry *dentry)
 {
-	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(dentry->d_sb);
 	bool decodable = ofs->config.nfs_export;
 
 	/* Lower file handle for non-upper non-decodable */
@@ -444,7 +444,7 @@ static struct dentry *ovl_lookup_real_inode(struct super_block *sb,
 					    struct dentry *real,
 					    const struct ovl_layer *layer)
 {
-	struct ovl_fs *ofs = sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(sb);
 	struct dentry *index = NULL;
 	struct dentry *this = NULL;
 	struct inode *inode;
@@ -665,7 +665,7 @@ static struct dentry *ovl_get_dentry(struct super_block *sb,
 				     struct ovl_path *lowerpath,
 				     struct dentry *index)
 {
-	struct ovl_fs *ofs = sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(sb);
 	const struct ovl_layer *layer = upper ? &ofs->layers[0] : lowerpath->layer;
 	struct dentry *real = upper ?: (index ?: lowerpath->dentry);
 
@@ -690,7 +690,7 @@ static struct dentry *ovl_get_dentry(struct super_block *sb,
 static struct dentry *ovl_upper_fh_to_d(struct super_block *sb,
 					struct ovl_fh *fh)
 {
-	struct ovl_fs *ofs = sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(sb);
 	struct dentry *dentry;
 	struct dentry *upper;
 
@@ -710,7 +710,7 @@ static struct dentry *ovl_upper_fh_to_d(struct super_block *sb,
 static struct dentry *ovl_lower_fh_to_d(struct super_block *sb,
 					struct ovl_fh *fh)
 {
-	struct ovl_fs *ofs = sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(sb);
 	struct ovl_path origin = { };
 	struct ovl_path *stack = &origin;
 	struct dentry *dentry = NULL;
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
@@ -341,7 +341,7 @@ static const char *ovl_get_link(struct dentry *dentry,
 
 bool ovl_is_private_xattr(struct super_block *sb, const char *name)
 {
-	struct ovl_fs *ofs = sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(sb);
 
 	if (ofs->config.userxattr)
 		return strncmp(name, OVL_XATTR_USER_PREFIX,
@@ -696,7 +696,7 @@ int ovl_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,
 int ovl_update_time(struct inode *inode, struct timespec64 *ts, int flags)
 {
 	if (flags & S_ATIME) {
-		struct ovl_fs *ofs = inode->i_sb->s_fs_info;
+		struct ovl_fs *ofs = OVL_FS(inode->i_sb);
 		struct path upperpath = {
 			.mnt = ovl_upper_mnt(ofs),
 			.dentry = ovl_upperdentry_dereference(OVL_I(inode)),
@@ -1291,7 +1291,7 @@ struct inode *ovl_get_trap_inode(struct super_block *sb, struct dentry *dir)
 static bool ovl_hash_bylower(struct super_block *sb, struct dentry *upper,
 			     struct dentry *lower, bool index)
 {
-	struct ovl_fs *ofs = sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(sb);
 
 	/* No, if pure upper */
 	if (!lower)
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
@@ -892,7 +892,7 @@ static int ovl_fix_origin(struct ovl_fs *ofs, struct dentry *dentry,
 
 static int ovl_maybe_validate_verity(struct dentry *dentry)
 {
-	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(dentry->d_sb);
 	struct inode *inode = d_inode(dentry);
 	struct path datapath, metapath;
 	int err;
@@ -1002,7 +1002,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
 {
 	struct ovl_entry *oe = NULL;
 	const struct cred *old_cred;
-	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(dentry->d_sb);
 	struct ovl_entry *poe = OVL_E(dentry->d_parent);
 	struct ovl_entry *roe = OVL_E(dentry->d_sb->s_root);
 	struct ovl_path *stack = NULL, *origin_path = NULL;
diff --git a/fs/overlayfs/ovl_entry.h b/fs/overlayfs/ovl_entry.h
@@ -117,6 +117,8 @@ static inline struct mnt_idmap *ovl_upper_mnt_idmap(struct ovl_fs *ofs)
 	return mnt_idmap(ovl_upper_mnt(ofs));
 }
 
+extern struct file_system_type ovl_fs_type;
+
 static inline struct ovl_fs *OVL_FS(struct super_block *sb)
 {
 	return (struct ovl_fs *)sb->s_fs_info;
diff --git a/fs/overlayfs/params.c b/fs/overlayfs/params.c
@@ -662,7 +662,7 @@ static void ovl_free(struct fs_context *fc)
 static int ovl_reconfigure(struct fs_context *fc)
 {
 	struct super_block *sb = fc->root->d_sb;
-	struct ovl_fs *ofs = sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(sb);
 	struct super_block *upper_sb;
 	int ret = 0;
 
@@ -947,7 +947,7 @@ int ovl_fs_params_verify(const struct ovl_fs_context *ctx,
 int ovl_show_options(struct seq_file *m, struct dentry *dentry)
 {
 	struct super_block *sb = dentry->d_sb;
-	struct ovl_fs *ofs = sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(sb);
 	size_t nr, nr_merged_lower = ofs->numlayer - ofs->numdatalayer;
 	const struct ovl_layer *data_layers = &ofs->layers[nr_merged_lower];
 
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
@@ -185,7 +185,7 @@ static void ovl_destroy_inode(struct inode *inode)
 
 static void ovl_put_super(struct super_block *sb)
 {
-	struct ovl_fs *ofs = sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(sb);
 
 	if (ofs)
 		ovl_free_fs(ofs);
@@ -194,7 +194,7 @@ static void ovl_put_super(struct super_block *sb)
 /* Sync real dirty inodes in upper filesystem (if it exists) */
 static int ovl_sync_fs(struct super_block *sb, int wait)
 {
-	struct ovl_fs *ofs = sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(sb);
 	struct super_block *upper_sb;
 	int ret;
 
@@ -1501,7 +1501,7 @@ int ovl_fill_super(struct super_block *sb, struct fs_context *fc)
 	return err;
 }
 
-static struct file_system_type ovl_fs_type = {
+struct file_system_type ovl_fs_type = {
 	.owner			= THIS_MODULE,
 	.name			= "overlay",
 	.init_fs_context	= ovl_init_fs_context,
diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
@@ -19,25 +19,25 @@
 
 int ovl_want_write(struct dentry *dentry)
 {
-	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(dentry->d_sb);
 	return mnt_want_write(ovl_upper_mnt(ofs));
 }
 
 void ovl_drop_write(struct dentry *dentry)
 {
-	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(dentry->d_sb);
 	mnt_drop_write(ovl_upper_mnt(ofs));
 }
 
 struct dentry *ovl_workdir(struct dentry *dentry)
 {
-	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(dentry->d_sb);
 	return ofs->workdir;
 }
 
 const struct cred *ovl_override_creds(struct super_block *sb)
 {
-	struct ovl_fs *ofs = sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(sb);
 
 	return override_creds(ofs->creator_cred);
 }
@@ -63,23 +63,23 @@ int ovl_can_decode_fh(struct super_block *sb)
 
 struct dentry *ovl_indexdir(struct super_block *sb)
 {
-	struct ovl_fs *ofs = sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(sb);
 
 	return ofs->indexdir;
 }
 
 /* Index all files on copy up. For now only enabled for NFS export */
 bool ovl_index_all(struct super_block *sb)
 {
-	struct ovl_fs *ofs = sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(sb);
 
 	return ofs->config.nfs_export && ofs->config.index;
 }
 
 /* Verify lower origin on lookup. For now only enabled for NFS export */
 bool ovl_verify_lower(struct super_block *sb)
 {
-	struct ovl_fs *ofs = sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(sb);
 
 	return ofs->config.nfs_export && ofs->config.index;
 }
@@ -204,7 +204,7 @@ enum ovl_path_type ovl_path_type(struct dentry *dentry)
 
 void ovl_path_upper(struct dentry *dentry, struct path *path)
 {
-	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
+	struct ovl_fs *ofs = OVL_FS(dentry->d_sb);
 
 	path->mnt = ovl_upper_mnt(ofs);
 	path->dentry = ovl_dentry_upper(dentry);

Original file line number	Diff line number	Diff line change
`@@ -932,7 +932,7 @@ static int ovl_do_copy_up(struct ovl_copy_up_ctx *c)`
`932`	`932`	`static bool ovl_need_meta_copy_up(struct dentry *dentry, umode_t mode,`
`933`	`933`	`int flags)`
`934`	`934`	`{`
`935`		`- struct ovl_fs *ofs = dentry->d_sb->s_fs_info;`
	`935`	`+ struct ovl_fs *ofs = OVL_FS(dentry->d_sb);`
`936`	`936`
`937`	`937`	`if (!ofs->config.metacopy)`
`938`	`938`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,8 @@ static inline struct mnt_idmap ovl_upper_mnt_idmap(struct ovl_fs ofs)`
`117`	`117`	`return mnt_idmap(ovl_upper_mnt(ofs));`
`118`	`118`	`}`
`119`	`119`
	`120`	`+extern struct file_system_type ovl_fs_type;`
	`121`	`+`
`120`	`122`	`static inline struct ovl_fs OVL_FS(struct super_block sb)`
`121`	`123`	`{`
`122`	`124`	`return (struct ovl_fs *)sb->s_fs_info;`
Original file line number	Diff line number	Diff line change
`@@ -19,25 +19,25 @@`
`19`	`19`
`20`	`20`	`int ovl_want_write(struct dentry *dentry)`
`21`	`21`	`{`
`22`		`- struct ovl_fs *ofs = dentry->d_sb->s_fs_info;`
	`22`	`+ struct ovl_fs *ofs = OVL_FS(dentry->d_sb);`
`23`	`23`	`return mnt_want_write(ovl_upper_mnt(ofs));`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`void ovl_drop_write(struct dentry *dentry)`
`27`	`27`	`{`
`28`		`- struct ovl_fs *ofs = dentry->d_sb->s_fs_info;`
	`28`	`+ struct ovl_fs *ofs = OVL_FS(dentry->d_sb);`
`29`	`29`	`mnt_drop_write(ovl_upper_mnt(ofs));`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`struct dentry ovl_workdir(struct dentry dentry)`
`33`	`33`	`{`
`34`		`- struct ovl_fs *ofs = dentry->d_sb->s_fs_info;`
	`34`	`+ struct ovl_fs *ofs = OVL_FS(dentry->d_sb);`
`35`	`35`	`return ofs->workdir;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`const struct cred ovl_override_creds(struct super_block sb)`
`39`	`39`	`{`
`40`		`- struct ovl_fs *ofs = sb->s_fs_info;`
	`40`	`+ struct ovl_fs *ofs = OVL_FS(sb);`
`41`	`41`
`42`	`42`	`return override_creds(ofs->creator_cred);`
`43`	`43`	`}`
`@@ -63,23 +63,23 @@ int ovl_can_decode_fh(struct super_block *sb)`
`63`	`63`
`64`	`64`	`struct dentry ovl_indexdir(struct super_block sb)`
`65`	`65`	`{`
`66`		`- struct ovl_fs *ofs = sb->s_fs_info;`
	`66`	`+ struct ovl_fs *ofs = OVL_FS(sb);`
`67`	`67`
`68`	`68`	`return ofs->indexdir;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/* Index all files on copy up. For now only enabled for NFS export */`
`72`	`72`	`bool ovl_index_all(struct super_block *sb)`
`73`	`73`	`{`
`74`		`- struct ovl_fs *ofs = sb->s_fs_info;`
	`74`	`+ struct ovl_fs *ofs = OVL_FS(sb);`
`75`	`75`
`76`	`76`	`return ofs->config.nfs_export && ofs->config.index;`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`/* Verify lower origin on lookup. For now only enabled for NFS export */`
`80`	`80`	`bool ovl_verify_lower(struct super_block *sb)`
`81`	`81`	`{`
`82`		`- struct ovl_fs *ofs = sb->s_fs_info;`
	`82`	`+ struct ovl_fs *ofs = OVL_FS(sb);`
`83`	`83`
`84`	`84`	`return ofs->config.nfs_export && ofs->config.index;`
`85`	`85`	`}`
`@@ -204,7 +204,7 @@ enum ovl_path_type ovl_path_type(struct dentry *dentry)`
`204`	`204`
`205`	`205`	`void ovl_path_upper(struct dentry dentry, struct path path)`
`206`	`206`	`{`
`207`		`- struct ovl_fs *ofs = dentry->d_sb->s_fs_info;`
	`207`	`+ struct ovl_fs *ofs = OVL_FS(dentry->d_sb);`
`208`	`208`
`209`	`209`	`path->mnt = ovl_upper_mnt(ofs);`
`210`	`210`	`path->dentry = ovl_dentry_upper(dentry);`