Commit 71097047 authored by Miklos Szeredi's avatar Miklos Szeredi

ovl: adhere to the vfs_ vs. ovl_do_ conventions for xattrs

Call ovl_do_*xattr() when accessing an overlay private xattr, vfs_*xattr()
otherwise.

This has an effect on debug output, which is made more consistent by this
patch.
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent d5dc7486
...@@ -840,14 +840,14 @@ static int ovl_copy_up_meta_inode_data(struct ovl_copy_up_ctx *c) ...@@ -840,14 +840,14 @@ static int ovl_copy_up_meta_inode_data(struct ovl_copy_up_ctx *c)
* don't want that to happen for normal copy-up operation. * don't want that to happen for normal copy-up operation.
*/ */
if (capability) { if (capability) {
err = ovl_do_setxattr(upperpath.dentry, XATTR_NAME_CAPS, err = vfs_setxattr(upperpath.dentry, XATTR_NAME_CAPS,
capability, cap_size, 0); capability, cap_size, 0);
if (err) if (err)
goto out_free; goto out_free;
} }
err = vfs_removexattr(upperpath.dentry, OVL_XATTR_METACOPY); err = ovl_do_removexattr(upperpath.dentry, OVL_XATTR_METACOPY);
if (err) if (err)
goto out_free; goto out_free;
......
...@@ -1327,7 +1327,7 @@ static int ovl_make_workdir(struct super_block *sb, struct ovl_fs *ofs, ...@@ -1327,7 +1327,7 @@ static int ovl_make_workdir(struct super_block *sb, struct ovl_fs *ofs,
pr_warn("upper fs does not support xattr, falling back to index=off and metacopy=off.\n"); pr_warn("upper fs does not support xattr, falling back to index=off and metacopy=off.\n");
err = 0; err = 0;
} else { } else {
vfs_removexattr(ofs->workdir, OVL_XATTR_OPAQUE); ovl_do_removexattr(ofs->workdir, OVL_XATTR_OPAQUE);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment