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

4 files changed, 16 insertions, 66 deletions

diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index fa70848afa8f..cd95d14f9cc2 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -292,16 +292,21 @@ bad_block:	ext2_error(inode->i_sb, "ext2_xattr_list",
                 const struct xattr_handler *handler =
                         ext2_xattr_handler(entry->e_name_index);
 
-                if (handler) {
-                        size_t size = handler->list(handler, dentry, buffer,
-                                                    rest, entry->e_name,
-                                                    entry->e_name_len);
+                if (handler && (!handler->list || handler->list(dentry))) {
+                        const char *prefix = handler->prefix ?: handler->name;
+                        size_t prefix_len = strlen(prefix);
+                        size_t size = prefix_len + entry->e_name_len + 1;
+
                         if (buffer) {
                                 if (size > rest) {
                                         error = -ERANGE;
                                         goto cleanup;
                                 }
-                                buffer += size;
+                                memcpy(buffer, prefix, prefix_len);
+                                buffer += prefix_len;
+                                memcpy(buffer, entry->e_name, entry->e_name_len);
+                                buffer += entry->e_name_len;
+                                *buffer++ = 0;
                         }
                         rest -= size;
                 }
diff --git a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c
index dfb08750370d..ba97f243b050 100644
--- a/fs/ext2/xattr_security.c
+++ b/fs/ext2/xattr_security.c
@@ -7,29 +7,11 @@
 #include <linux/security.h>
 #include "xattr.h"
 
-static size_t
-ext2_xattr_security_list(const struct xattr_handler *handler,
-                         struct dentry *dentry, char *list, size_t list_size,
-                         const char *name, size_t name_len)
-{
-        const int prefix_len = XATTR_SECURITY_PREFIX_LEN;
-        const size_t total_len = prefix_len + name_len + 1;
-
-        if (list && total_len <= list_size) {
-                memcpy(list, XATTR_SECURITY_PREFIX, prefix_len);
-                memcpy(list+prefix_len, name, name_len);
-                list[prefix_len + name_len] = '\0';
-        }
-        return total_len;
-}
-
 static int
 ext2_xattr_security_get(const struct xattr_handler *handler,
                         struct dentry *dentry, const char *name,
                         void *buffer, size_t size)
 {
-        if (strcmp(name, "") == 0)
-                return -EINVAL;
         return ext2_xattr_get(d_inode(dentry), EXT2_XATTR_INDEX_SECURITY, name,
                               buffer, size);
 }
@@ -39,8 +21,6 @@ ext2_xattr_security_set(const struct xattr_handler *handler,
                         struct dentry *dentry, const char *name,
                         const void *value, size_t size, int flags)
 {
-        if (strcmp(name, "") == 0)
-                return -EINVAL;
         return ext2_xattr_set(d_inode(dentry), EXT2_XATTR_INDEX_SECURITY, name,
                               value, size, flags);
 }
@@ -71,7 +51,6 @@ ext2_init_security(struct inode *inode, struct inode *dir,
 
 const struct xattr_handler ext2_xattr_security_handler = {
         .prefix = XATTR_SECURITY_PREFIX,
-        .list   = ext2_xattr_security_list,
         .get    = ext2_xattr_security_get,
         .set    = ext2_xattr_security_set,
 };
diff --git a/fs/ext2/xattr_trusted.c b/fs/ext2/xattr_trusted.c
index 3150dd3a7859..2c94d1930626 100644
--- a/fs/ext2/xattr_trusted.c
+++ b/fs/ext2/xattr_trusted.c
@@ -8,23 +8,10 @@
 #include "ext2.h"
 #include "xattr.h"
 
-static size_t
-ext2_xattr_trusted_list(const struct xattr_handler *handler,
-                        struct dentry *dentry, char *list, size_t list_size,
-                        const char *name, size_t name_len)
+static bool
+ext2_xattr_trusted_list(struct dentry *dentry)
 {
-        const int prefix_len = XATTR_TRUSTED_PREFIX_LEN;
-        const size_t total_len = prefix_len + name_len + 1;
-
-        if (!capable(CAP_SYS_ADMIN))
-                return 0;
-
-        if (list && total_len <= list_size) {
-                memcpy(list, XATTR_TRUSTED_PREFIX, prefix_len);
-                memcpy(list+prefix_len, name, name_len);
-                list[prefix_len + name_len] = '\0';
-        }
-        return total_len;
+        return capable(CAP_SYS_ADMIN);
 }
 
 static int
@@ -32,8 +19,6 @@ ext2_xattr_trusted_get(const struct xattr_handler *handler,
                        struct dentry *dentry, const char *name,
                        void *buffer, size_t size)
 {
-        if (strcmp(name, "") == 0)
-                return -EINVAL;
         return ext2_xattr_get(d_inode(dentry), EXT2_XATTR_INDEX_TRUSTED, name,
                               buffer, size);
 }
@@ -43,8 +28,6 @@ ext2_xattr_trusted_set(const struct xattr_handler *handler,
                        struct dentry *dentry, const char *name,
                        const void *value, size_t size, int flags)
 {
-        if (strcmp(name, "") == 0)
-                return -EINVAL;
         return ext2_xattr_set(d_inode(dentry), EXT2_XATTR_INDEX_TRUSTED, name,
                               value, size, flags);
 }
diff --git a/fs/ext2/xattr_user.c b/fs/ext2/xattr_user.c
index 339a49bbb8ef..72a2a96d677f 100644
--- a/fs/ext2/xattr_user.c
+++ b/fs/ext2/xattr_user.c
@@ -10,23 +10,10 @@
 #include "ext2.h"
 #include "xattr.h"
 
-static size_t
-ext2_xattr_user_list(const struct xattr_handler *handler,
-                     struct dentry *dentry, char *list, size_t list_size,
-                     const char *name, size_t name_len)
+static bool
+ext2_xattr_user_list(struct dentry *dentry)
 {
-        const size_t prefix_len = XATTR_USER_PREFIX_LEN;
-        const size_t total_len = prefix_len + name_len + 1;
-
-        if (!test_opt(dentry->d_sb, XATTR_USER))
-                return 0;
-
-        if (list && total_len <= list_size) {
-                memcpy(list, XATTR_USER_PREFIX, prefix_len);
-                memcpy(list+prefix_len, name, name_len);
-                list[prefix_len + name_len] = '\0';
-        }
-        return total_len;
+        return test_opt(dentry->d_sb, XATTR_USER);
 }
 
 static int
@@ -34,8 +21,6 @@ ext2_xattr_user_get(const struct xattr_handler *handler,
                     struct dentry *dentry, const char *name,
                     void *buffer, size_t size)
 {
-        if (strcmp(name, "") == 0)
-                return -EINVAL;
         if (!test_opt(dentry->d_sb, XATTR_USER))
                 return -EOPNOTSUPP;
         return ext2_xattr_get(d_inode(dentry), EXT2_XATTR_INDEX_USER,
@@ -47,8 +32,6 @@ ext2_xattr_user_set(const struct xattr_handler *handler,
                     struct dentry *dentry, const char *name,
                     const void *value, size_t size, int flags)
 {
-        if (strcmp(name, "") == 0)
-                return -EINVAL;
         if (!test_opt(dentry->d_sb, XATTR_USER))
                 return -EOPNOTSUPP;