openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Miklos Szeredi <mszeredi@redhat.com>
This commit is contained in:
Miklos Szeredi 2020-09-02 10:58:48 +02:00
parent d5dc7486e8
commit 7109704705
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/overlayfs/copy_up.c
View File

@ -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;

2
fs/overlayfs/super.c
View File

@ -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);
} }
/* /*