Skip to content

Commit 7109704

Browse files
author
Miklos Szeredi
committed
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>
1 parent d5dc748 commit 7109704

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

fs/overlayfs/copy_up.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -840,14 +840,14 @@ static int ovl_copy_up_meta_inode_data(struct ovl_copy_up_ctx *c)
840840
* don't want that to happen for normal copy-up operation.
841841
*/
842842
if (capability) {
843-
err = ovl_do_setxattr(upperpath.dentry, XATTR_NAME_CAPS,
844-
capability, cap_size, 0);
843+
err = vfs_setxattr(upperpath.dentry, XATTR_NAME_CAPS,
844+
capability, cap_size, 0);
845845
if (err)
846846
goto out_free;
847847
}
848848

849849

850-
err = vfs_removexattr(upperpath.dentry, OVL_XATTR_METACOPY);
850+
err = ovl_do_removexattr(upperpath.dentry, OVL_XATTR_METACOPY);
851851
if (err)
852852
goto out_free;
853853

fs/overlayfs/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1327,7 +1327,7 @@ static int ovl_make_workdir(struct super_block *sb, struct ovl_fs *ofs,
13271327
pr_warn("upper fs does not support xattr, falling back to index=off and metacopy=off.\n");
13281328
err = 0;
13291329
} else {
1330-
vfs_removexattr(ofs->workdir, OVL_XATTR_OPAQUE);
1330+
ovl_do_removexattr(ofs->workdir, OVL_XATTR_OPAQUE);
13311331
}
13321332

13331333
/*

0 commit comments

Comments
 (0)