Commit f01d0889 authored by Andrea Righi's avatar Andrea Righi Committed by Amir Goldstein
Browse files

ovl: make consistent use of OVL_FS() 



Always use OVL_FS() to retrieve the corresponding struct ovl_fs from a
struct super_block.

Reviewed-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarAndrea Righi <andrea.righi@canonical.com>
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
parent 36295542

fs/overlayfs/copy_up.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/overlayfs/export.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

fs/overlayfs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

fs/overlayfs/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

fs/overlayfs/ovl_entry.h

+2 −0
Original line number Diff line number Diff line
@@ -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;