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

2 files changed, 4 insertions, 16 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;
diff --git a/fs/hfsplus/xattr.c b/fs/hfsplus/xattr.c
index e41a010cd89c..ab01530b4930 100644
--- a/fs/hfsplus/xattr.c
+++ b/fs/hfsplus/xattr.c
@@ -431,9 +431,6 @@ int hfsplus_setxattr(struct dentry *dentry, const char *name,
         char *xattr_name;
         int res;
 
-        if (!strcmp(name, ""))
-                return -EINVAL;
-
         xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
                 GFP_KERNEL);
         if (!xattr_name)
@@ -589,9 +586,6 @@ ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
         int res;
         char *xattr_name;
 
-        if (!strcmp(name, ""))
-                return -EINVAL;
-
         xattr_name = kmalloc(NLS_MAX_CHARSET_SIZE * HFSPLUS_ATTR_MAX_STRLEN + 1,
                              GFP_KERNEL);
         if (!xattr_name)
@@ -853,9 +847,6 @@ static int hfsplus_osx_getxattr(const struct xattr_handler *handler,
                                 struct dentry *dentry, const char *name,
                                 void *buffer, size_t size)
 {
-        if (!strcmp(name, ""))
-                return -EINVAL;
-
         /*
          * Don't allow retrieving properly prefixed attributes
          * by prepending them with "osx."
@@ -876,9 +867,6 @@ static int hfsplus_osx_setxattr(const struct xattr_handler *handler,
                                 struct dentry *dentry, const char *name,
                                 const void *buffer, size_t size, int flags)
 {
-        if (!strcmp(name, ""))
-                return -EINVAL;
-
         /*
          * Don't allow setting properly prefixed attributes
          * by prepending them with "osx."