posix acls: Remove duplicate xattr name definitions

Remove POSIX_ACL_XATTR_{ACCESS,DEFAULT} and GFS2_POSIX_ACL_{ACCESS,DEFAULT}
and replace them with the definitions in <include/uapi/linux/xattr.h>.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: James Morris <james.l.morris@oracle.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 4 insertions, 4 deletions

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index a70c5790f8f5..d540fd70f6c6 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3550,10 +3550,10 @@ static noinline int acls_after_inode_item(struct extent_buffer *leaf,
         int scanned = 0;
 
         if (!xattr_access) {
-                xattr_access = btrfs_name_hash(POSIX_ACL_XATTR_ACCESS,
-                                        strlen(POSIX_ACL_XATTR_ACCESS));
-                xattr_default = btrfs_name_hash(POSIX_ACL_XATTR_DEFAULT,
-                                        strlen(POSIX_ACL_XATTR_DEFAULT));
+                xattr_access = btrfs_name_hash(XATTR_NAME_POSIX_ACL_ACCESS,
+                                        strlen(XATTR_NAME_POSIX_ACL_ACCESS));
+                xattr_default = btrfs_name_hash(XATTR_NAME_POSIX_ACL_DEFAULT,
+                                        strlen(XATTR_NAME_POSIX_ACL_DEFAULT));
         }
 
         slot++;