NFS: Remove an incorrect revalidation in nfs4_update_changeattr_locked()

[mirror_ubuntu-jammy-kernel.git] / fs / xattr.c

diff --git a/fs/xattr.c b/fs/xattr.c
index 5c8c5175b385c274eaac9a239ba0749b9372ff98..8cff77db8192c3c19b970ceff71f56422f7aab2d 100644 (file)
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -237,6 +237,7 @@ int __vfs_setxattr_noperm(struct user_namespace *mnt_userns,
 
        return error;
 }
+EXPORT_SYMBOL_GPL(__vfs_setxattr_noperm);
 
 /**
  * __vfs_setxattr_locked - set an extended attribute while holding the inode
@@ -384,6 +385,7 @@ vfs_getxattr_alloc(struct user_namespace *mnt_userns, struct dentry *dentry,
        *xattr_value = value;
        return error;
 }
+EXPORT_SYMBOL_GPL(vfs_getxattr_alloc);
 
 ssize_t
 __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
@@ -470,6 +472,34 @@ __vfs_removexattr(struct user_namespace *mnt_userns, struct dentry *dentry,
 }
 EXPORT_SYMBOL(__vfs_removexattr);
 
+/**
+ *  __vfs_removexattr_noperm - perform removexattr operation without
+ *  performing permission checks.
+ *
+ *  @dentry - object to perform setxattr on
+ *  @name - xattr name to set
+ *
+ *  returns the result of the internal setxattr or setsecurity operations.
+ *
+ *  This function requires the caller to lock the inode's i_mutex before it
+ *  is executed. It also assumes that the caller will make the appropriate
+ *  permission checks.
+ */
+int
+__vfs_removexattr_noperm(struct user_namespace *mnt_userns,
+                        struct dentry *dentry, const char *name)
+{
+       int error;
+
+       error =__vfs_removexattr(mnt_userns, dentry, name);
+       if (!error) {
+               fsnotify_xattr(dentry);
+               evm_inode_post_removexattr(dentry, name);
+       }
+       return error;
+}
+EXPORT_SYMBOL_GPL(__vfs_removexattr_noperm);
+
 /**
  * __vfs_removexattr_locked - set an extended attribute while holding the inode
  * lock
@@ -500,12 +530,7 @@ __vfs_removexattr_locked(struct user_namespace *mnt_userns,
        if (error)
                goto out;
 
-       error = __vfs_removexattr(mnt_userns, dentry, name);
-
-       if (!error) {
-               fsnotify_xattr(dentry);
-               evm_inode_post_removexattr(dentry, name);
-       }
+       error = __vfs_removexattr_noperm(mnt_userns, dentry, name);
 
 out:
        return error;