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>

diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index cf0b6406748dbd76089e9d233bf62d467901b1b9..ebce234f092bd23a0456b9811addb44a501a81f7 100644 (file)
--- 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 8b419ef78502a1c8fe83b82600e63879f0f5477f..9e4c6ce3ce57138083746c267e48b1bd3b99b345 100644 (file)
--- 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);
        }
 
        /*