Commit a0c236b1 authored by Amir Goldstein's avatar Amir Goldstein Committed by Miklos Szeredi
Browse files

ovl: pass ovl_fs to ovl_check_setxattr() 



Instead of passing the overlay dentry.

Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 4f911138

fs/overlayfs/copy_up.c

+5 −5
Original line number Diff line number Diff line
@@ -331,8 +331,8 @@ struct ovl_fh *ovl_encode_real_fh(struct ovl_fs *ofs, struct dentry *real, 
	return ERR_PTR(err);

}



int ovl_set_origin(struct ovl_fs *ofs, struct dentry *dentry,

		   struct dentry *lower, struct dentry *upper)

int ovl_set_origin(struct ovl_fs *ofs, struct dentry *lower,

		   struct dentry *upper)

{

	const struct ovl_fh *fh = NULL;

	int err;
@@ -351,7 +351,7 @@ int ovl_set_origin(struct ovl_fs *ofs, struct dentry *dentry, 
	/*

	 * Do not fail when upper doesn't support xattrs.

	 */

	err = ovl_check_setxattr(dentry, upper, OVL_XATTR_ORIGIN, fh->buf,

	err = ovl_check_setxattr(ofs, upper, OVL_XATTR_ORIGIN, fh->buf,

				 fh ? fh->fb.len : 0, 0);

	kfree(fh);
@@ -526,13 +526,13 @@ static int ovl_copy_up_inode(struct ovl_copy_up_ctx *c, struct dentry *temp) 
	 * hard link.

	 */

	if (c->origin) {

		err = ovl_set_origin(ofs, c->dentry, c->lowerpath.dentry, temp);

		err = ovl_set_origin(ofs, c->lowerpath.dentry, temp);

		if (err)

			return err;

	}



	if (c->metacopy) {

		err = ovl_check_setxattr(c->dentry, temp, OVL_XATTR_METACOPY,

		err = ovl_check_setxattr(ofs, temp, OVL_XATTR_METACOPY,

					 NULL, 0, -EOPNOTSUPP);

		if (err)

			return err;

fs/overlayfs/dir.c

+4 −2
Original line number Diff line number Diff line
@@ -233,9 +233,10 @@ struct dentry *ovl_create_temp(struct dentry *workdir, struct ovl_cattr *attr) 
static int ovl_set_opaque_xerr(struct dentry *dentry, struct dentry *upper,

			       int xerr)

{

	struct ovl_fs *ofs = OVL_FS(dentry->d_sb);

	int err;



	err = ovl_check_setxattr(dentry, upper, OVL_XATTR_OPAQUE, "y", 1, xerr);

	err = ovl_check_setxattr(ofs, upper, OVL_XATTR_OPAQUE, "y", 1, xerr);

	if (!err)

		ovl_dentry_set_opaque(dentry);
@@ -1043,6 +1044,7 @@ static bool ovl_need_absolute_redirect(struct dentry *dentry, bool samedir) 
static int ovl_set_redirect(struct dentry *dentry, bool samedir)

{

	int err;

	struct ovl_fs *ofs = OVL_FS(dentry->d_sb);

	const char *redirect = ovl_dentry_get_redirect(dentry);

	bool absolute_redirect = ovl_need_absolute_redirect(dentry, samedir);
@@ -1053,7 +1055,7 @@ static int ovl_set_redirect(struct dentry *dentry, bool samedir) 
	if (IS_ERR(redirect))

		return PTR_ERR(redirect);



	err = ovl_check_setxattr(dentry, ovl_dentry_upper(dentry),

	err = ovl_check_setxattr(ofs, ovl_dentry_upper(dentry),

				 OVL_XATTR_REDIRECT,

				 redirect, strlen(redirect), -EXDEV);

	if (!err) {

fs/overlayfs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ static int ovl_fix_origin(struct ovl_fs *ofs, struct dentry *dentry, 
	if (err)

		return err;



	err = ovl_set_origin(ofs, dentry, lower, upper);

	err = ovl_set_origin(ofs, lower, upper);

	if (!err)

		err = ovl_set_impure(dentry->d_parent, upper->d_parent);

fs/overlayfs/overlayfs.h

+3 −3
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ bool ovl_already_copied_up(struct dentry *dentry, int flags); 
bool ovl_check_origin_xattr(struct ovl_fs *ofs, struct dentry *dentry);

bool ovl_check_dir_xattr(struct super_block *sb, struct dentry *dentry,

			 enum ovl_xattr ox);

int ovl_check_setxattr(struct dentry *dentry, struct dentry *upperdentry,

int ovl_check_setxattr(struct ovl_fs *ofs, struct dentry *upperdentry,

		       enum ovl_xattr ox, const void *value, size_t size,

		       int xerr);

int ovl_set_impure(struct dentry *dentry, struct dentry *upperdentry);
@@ -561,8 +561,8 @@ int ovl_copy_xattr(struct super_block *sb, struct dentry *old, 
int ovl_set_attr(struct dentry *upper, struct kstat *stat);

struct ovl_fh *ovl_encode_real_fh(struct ovl_fs *ofs, struct dentry *real,

				  bool is_upper);

int ovl_set_origin(struct ovl_fs *ofs, struct dentry *dentry,

		   struct dentry *lower, struct dentry *upper);

int ovl_set_origin(struct ovl_fs *ofs, struct dentry *lower,

		   struct dentry *upper);



/* export.c */

extern const struct export_operations ovl_export_operations;

fs/overlayfs/util.c

+3 −4
Original line number Diff line number Diff line
@@ -600,12 +600,11 @@ const char *const ovl_xattr_table[][2] = { 
	OVL_XATTR_TAB_ENTRY(OVL_XATTR_METACOPY),

};



int ovl_check_setxattr(struct dentry *dentry, struct dentry *upperdentry,

int ovl_check_setxattr(struct ovl_fs *ofs, struct dentry *upperdentry,

		       enum ovl_xattr ox, const void *value, size_t size,

		       int xerr)

{

	int err;

	struct ovl_fs *ofs = dentry->d_sb->s_fs_info;



	if (ofs->noxattr)

		return xerr;
@@ -623,6 +622,7 @@ int ovl_check_setxattr(struct dentry *dentry, struct dentry *upperdentry, 


int ovl_set_impure(struct dentry *dentry, struct dentry *upperdentry)

{

	struct ovl_fs *ofs = OVL_FS(dentry->d_sb);

	int err;



	if (ovl_test_flag(OVL_IMPURE, d_inode(dentry)))
@@ -632,8 +632,7 @@ int ovl_set_impure(struct dentry *dentry, struct dentry *upperdentry) 
	 * Do not fail when upper doesn't support xattrs.

	 * Upper inodes won't have origin nor redirect xattr anyway.

	 */

	err = ovl_check_setxattr(dentry, upperdentry, OVL_XATTR_IMPURE,

				 "y", 1, 0);

	err = ovl_check_setxattr(ofs, upperdentry, OVL_XATTR_IMPURE, "y", 1, 0);

	if (!err)

		ovl_set_flag(OVL_IMPURE, d_inode(dentry));