diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2020-09-02 10:58:48 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2020-09-02 10:58:48 +0200 |
| commit | 7109704705a4d80516de00779bba38b3844bff13 (patch) | |
| tree | 5a5ecfa5adb480ed1d3fd6a3a7412726f26c71e1 /fs/overlayfs | |
| parent | d5dc7486e8c6dd860b81842cd5d999e3782d5795 (diff) | |
| download | linux-7109704705a4d80516de00779bba38b3844bff13.tar.gz linux-7109704705a4d80516de00779bba38b3844bff13.tar.bz2 linux-7109704705a4d80516de00779bba38b3844bff13.zip | |
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>
Diffstat (limited to 'fs/overlayfs')
| -rw-r--r-- | fs/overlayfs/copy_up.c | 6 | ||||
| -rw-r--r-- | fs/overlayfs/super.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c index cf0b6406748d..ebce234f092b 100644 --- a/fs/overlayfs/copy_up.c +++ b/fs/overlayfs/copy_up.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. */ if (capability) { - err = ovl_do_setxattr(upperpath.dentry, XATTR_NAME_CAPS, - capability, cap_size, 0); + err = vfs_setxattr(upperpath.dentry, XATTR_NAME_CAPS, + capability, cap_size, 0); if (err) goto out_free; } - err = vfs_removexattr(upperpath.dentry, OVL_XATTR_METACOPY); + err = ovl_do_removexattr(upperpath.dentry, OVL_XATTR_METACOPY); if (err) goto out_free; diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index 8b419ef78502..9e4c6ce3ce57 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -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"); err = 0; } else { - vfs_removexattr(ofs->workdir, OVL_XATTR_OPAQUE); + ovl_do_removexattr(ofs->workdir, OVL_XATTR_OPAQUE); } /* |