Merge branch 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs xattr updates from Al Viro:
 "Andreas' xattr cleanup series.

  It's a followup to his xattr work that went in last cycle; -0.5KLoC"

* 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  xattr handlers: Simplify list operation
  ocfs2: Replace list xattr handler operations
  nfs: Move call to security_inode_listsecurity into nfs_listxattr
  xfs: Change how listxattr generates synthetic attributes
  tmpfs: listxattr should include POSIX ACL xattrs
  tmpfs: Use xattr handler infrastructure
  btrfs: Use xattr handler infrastructure
  vfs: Distinguish between full xattr names and proper prefixes
  posix acls: Remove duplicate xattr name definitions
  gfs2: Remove gfs2_xattr_acl_chmod
  vfs: Remove vfs_xattr_cmp

1 files changed, 8 insertions, 8 deletions

diff --git a/fs/ceph/acl.c b/fs/ceph/acl.c
index 8f84646f10e9..f19708487e2f 100644
--- a/fs/ceph/acl.c
+++ b/fs/ceph/acl.c
@@ -49,10 +49,10 @@ struct posix_acl *ceph_get_acl(struct inode *inode, int type)
 
         switch (type) {
         case ACL_TYPE_ACCESS:
-                name = POSIX_ACL_XATTR_ACCESS;
+                name = XATTR_NAME_POSIX_ACL_ACCESS;
                 break;
         case ACL_TYPE_DEFAULT:
-                name = POSIX_ACL_XATTR_DEFAULT;
+                name = XATTR_NAME_POSIX_ACL_DEFAULT;
                 break;
         default:
                 BUG();
@@ -92,7 +92,7 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 
         switch (type) {
         case ACL_TYPE_ACCESS:
-                name = POSIX_ACL_XATTR_ACCESS;
+                name = XATTR_NAME_POSIX_ACL_ACCESS;
                 if (acl) {
                         ret = posix_acl_equiv_mode(acl, &new_mode);
                         if (ret < 0)
@@ -106,7 +106,7 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type)
                         ret = acl ? -EINVAL : 0;
                         goto out;
                 }
-                name = POSIX_ACL_XATTR_DEFAULT;
+                name = XATTR_NAME_POSIX_ACL_DEFAULT;
                 break;
         default:
                 ret = -EINVAL;
@@ -202,11 +202,11 @@ int ceph_pre_init_acls(struct inode *dir, umode_t *mode,
         ceph_pagelist_encode_32(pagelist, acl && default_acl ? 2 : 1);
 
         if (acl) {
-                size_t len = strlen(POSIX_ACL_XATTR_ACCESS);
+                size_t len = strlen(XATTR_NAME_POSIX_ACL_ACCESS);
                 err = ceph_pagelist_reserve(pagelist, len + val_size1 + 8);
                 if (err)
                         goto out_err;
-                ceph_pagelist_encode_string(pagelist, POSIX_ACL_XATTR_ACCESS,
+                ceph_pagelist_encode_string(pagelist, XATTR_NAME_POSIX_ACL_ACCESS,
                                             len);
                 err = posix_acl_to_xattr(&init_user_ns, acl,
                                          tmp_buf, val_size1);
@@ -216,12 +216,12 @@ int ceph_pre_init_acls(struct inode *dir, umode_t *mode,
                 ceph_pagelist_append(pagelist, tmp_buf, val_size1);
         }
         if (default_acl) {
-                size_t len = strlen(POSIX_ACL_XATTR_DEFAULT);
+                size_t len = strlen(XATTR_NAME_POSIX_ACL_DEFAULT);
                 err = ceph_pagelist_reserve(pagelist, len + val_size2 + 8);
                 if (err)
                         goto out_err;
                 err = ceph_pagelist_encode_string(pagelist,
-                                                  POSIX_ACL_XATTR_DEFAULT, len);
+                                                  XATTR_NAME_POSIX_ACL_DEFAULT, len);
                 err = posix_acl_to_xattr(&init_user_ns, default_acl,
                                          tmp_buf, val_size2);
                 if (err < 0)