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/hfsplus/posix_acl.c b/fs/hfsplus/posix_acl.c
index df0c9af68d05..afb33eda6d7d 100644
--- a/fs/hfsplus/posix_acl.c
+++ b/fs/hfsplus/posix_acl.c
@@ -21,10 +21,10 @@ struct posix_acl *hfsplus_get_posix_acl(struct inode *inode, int type)
 
         switch (type) {
         case ACL_TYPE_ACCESS:
-                xattr_name = POSIX_ACL_XATTR_ACCESS;
+                xattr_name = XATTR_NAME_POSIX_ACL_ACCESS;
                 break;
         case ACL_TYPE_DEFAULT:
-                xattr_name = POSIX_ACL_XATTR_DEFAULT;
+                xattr_name = XATTR_NAME_POSIX_ACL_DEFAULT;
                 break;
         default:
                 return ERR_PTR(-EINVAL);
@@ -66,7 +66,7 @@ int hfsplus_set_posix_acl(struct inode *inode, struct posix_acl *acl,
 
         switch (type) {
         case ACL_TYPE_ACCESS:
-                xattr_name = POSIX_ACL_XATTR_ACCESS;
+                xattr_name = XATTR_NAME_POSIX_ACL_ACCESS;
                 if (acl) {
                         err = posix_acl_equiv_mode(acl, &inode->i_mode);
                         if (err < 0)
@@ -76,7 +76,7 @@ int hfsplus_set_posix_acl(struct inode *inode, struct posix_acl *acl,
                 break;
 
         case ACL_TYPE_DEFAULT:
-                xattr_name = POSIX_ACL_XATTR_DEFAULT;
+                xattr_name = XATTR_NAME_POSIX_ACL_DEFAULT;
                 if (!S_ISDIR(inode->i_mode))
                         return acl ? -EACCES : 0;
                 break;