Merge branch 'for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs xattr cleanups from Al Viro.

* 'for-linus-3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  f2fs: xattr simplifications
  squashfs: xattr simplifications
  9p: xattr simplifications
  xattr handlers: Pass handler to operations instead of flags
  jffs2: Add missing capability check for listing trusted xattrs
  hfsplus: Remove unused xattr handler list operations
  ubifs: Remove unused security xattr handler
  vfs: Fix the posix_acl_xattr_list return value
  vfs: Check attribute names in posix acl xattr handers

39 files changed, 390 insertions, 651 deletions

diff --git a/fs/9p/Makefile b/fs/9p/Makefile
index ff7be98f84f2..9619ccadd2fc 100644
--- a/fs/9p/Makefile
+++ b/fs/9p/Makefile
@@ -10,10 +10,7 @@ obj-$(CONFIG_9P_FS) := 9p.o
         vfs_dentry.o \
         v9fs.o \
         fid.o  \
-        xattr.o \
-        xattr_user.o \
-        xattr_trusted.o
+        xattr.o
 
 9p-$(CONFIG_9P_FSCACHE) += cache.o
 9p-$(CONFIG_9P_FS_POSIX_ACL) += acl.o
-9p-$(CONFIG_9P_FS_SECURITY) += xattr_security.o
diff --git a/fs/9p/acl.c b/fs/9p/acl.c
index 31c010372660..a7e28890f5ef 100644
--- a/fs/9p/acl.c
+++ b/fs/9p/acl.c
@@ -212,26 +212,9 @@ int v9fs_acl_mode(struct inode *dir, umode_t *modep,
         return 0;
 }
 
-static int v9fs_remote_get_acl(struct dentry *dentry, const char *name,
-                               void *buffer, size_t size, int type)
-{
-        char *full_name;
-
-        switch (type) {
-        case ACL_TYPE_ACCESS:
-                full_name =  POSIX_ACL_XATTR_ACCESS;
-                break;
-        case ACL_TYPE_DEFAULT:
-                full_name = POSIX_ACL_XATTR_DEFAULT;
-                break;
-        default:
-                BUG();
-        }
-        return v9fs_xattr_get(dentry, full_name, buffer, size);
-}
-
-static int v9fs_xattr_get_acl(struct dentry *dentry, const char *name,
-                              void *buffer, size_t size, int type)
+static int v9fs_xattr_get_acl(const struct xattr_handler *handler,
+                              struct dentry *dentry, const char *name,
+                              void *buffer, size_t size)
 {
         struct v9fs_session_info *v9ses;
         struct posix_acl *acl;
@@ -245,9 +228,9 @@ static int v9fs_xattr_get_acl(struct dentry *dentry, const char *name,
          * We allow set/get/list of acl when access=client is not specified
          */
         if ((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT)
-                return v9fs_remote_get_acl(dentry, name, buffer, size, type);
+                return v9fs_xattr_get(dentry, handler->prefix, buffer, size);
 
-        acl = v9fs_get_cached_acl(d_inode(dentry), type);
+        acl = v9fs_get_cached_acl(d_inode(dentry), handler->flags);
         if (IS_ERR(acl))
                 return PTR_ERR(acl);
         if (acl == NULL)
@@ -258,29 +241,9 @@ static int v9fs_xattr_get_acl(struct dentry *dentry, const char *name,
         return error;
 }
 
-static int v9fs_remote_set_acl(struct dentry *dentry, const char *name,
-                              const void *value, size_t size,
-                              int flags, int type)
-{
-        char *full_name;
-
-        switch (type) {
-        case ACL_TYPE_ACCESS:
-                full_name =  POSIX_ACL_XATTR_ACCESS;
-                break;
-        case ACL_TYPE_DEFAULT:
-                full_name = POSIX_ACL_XATTR_DEFAULT;
-                break;
-        default:
-                BUG();
-        }
-        return v9fs_xattr_set(dentry, full_name, value, size, flags);
-}
-
-
-static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name,
-                              const void *value, size_t size,
-                              int flags, int type)
+static int v9fs_xattr_set_acl(const struct xattr_handler *handler,
+                              struct dentry *dentry, const char *name,
+                              const void *value, size_t size, int flags)
 {
         int retval;
         struct posix_acl *acl;
@@ -296,8 +259,8 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name,
          * xattr value. We leave it to the server to validate
          */
         if ((v9ses->flags & V9FS_ACCESS_MASK) != V9FS_ACCESS_CLIENT)
-                return v9fs_remote_set_acl(dentry, name,
-                                           value, size, flags, type);
+                return v9fs_xattr_set(dentry, handler->prefix, value, size,
+                                      flags);
 
         if (S_ISLNK(inode->i_mode))
                 return -EOPNOTSUPP;
@@ -316,9 +279,8 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name,
         } else
                 acl = NULL;
 
-        switch (type) {
+        switch (handler->flags) {
         case ACL_TYPE_ACCESS:
-                name = POSIX_ACL_XATTR_ACCESS;
                 if (acl) {
                         umode_t mode = inode->i_mode;
                         retval = posix_acl_equiv_mode(acl, &mode);
@@ -349,7 +311,6 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name,
                 }
                 break;
         case ACL_TYPE_DEFAULT:
-                name = POSIX_ACL_XATTR_DEFAULT;
                 if (!S_ISDIR(inode->i_mode)) {
                         retval = acl ? -EINVAL : 0;
                         goto err_out;
@@ -358,9 +319,9 @@ static int v9fs_xattr_set_acl(struct dentry *dentry, const char *name,
         default:
                 BUG();
         }
-        retval = v9fs_xattr_set(dentry, name, value, size, flags);
+        retval = v9fs_xattr_set(dentry, handler->prefix, value, size, flags);
         if (!retval)
-                set_cached_acl(inode, type, acl);
+                set_cached_acl(inode, handler->flags, acl);
 err_out:
         posix_acl_release(acl);
         return retval;
diff --git a/fs/9p/xattr.c b/fs/9p/xattr.c
index 0cf44b6cccd6..e3d026ac382e 100644
--- a/fs/9p/xattr.c
+++ b/fs/9p/xattr.c
@@ -137,6 +137,48 @@ ssize_t v9fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
         return v9fs_xattr_get(dentry, NULL, buffer, buffer_size);
 }
 
+static int v9fs_xattr_handler_get(const struct xattr_handler *handler,
+                                  struct dentry *dentry, const char *name,
+                                  void *buffer, size_t size)
+{
+        const char *full_name = xattr_full_name(handler, name);
+
+        if (strcmp(name, "") == 0)
+                return -EINVAL;
+        return v9fs_xattr_get(dentry, full_name, buffer, size);
+}
+
+static int v9fs_xattr_handler_set(const struct xattr_handler *handler,
+                                  struct dentry *dentry, const char *name,
+                                  const void *value, size_t size, int flags)
+{
+        const char *full_name = xattr_full_name(handler, name);
+
+        if (strcmp(name, "") == 0)
+                return -EINVAL;
+        return v9fs_xattr_set(dentry, full_name, value, size, flags);
+}
+
+static struct xattr_handler v9fs_xattr_user_handler = {
+        .prefix = XATTR_USER_PREFIX,
+        .get    = v9fs_xattr_handler_get,
+        .set    = v9fs_xattr_handler_set,
+};
+
+static struct xattr_handler v9fs_xattr_trusted_handler = {
+        .prefix = XATTR_TRUSTED_PREFIX,
+        .get    = v9fs_xattr_handler_get,
+        .set    = v9fs_xattr_handler_set,
+};
+
+#ifdef CONFIG_9P_FS_SECURITY
+static struct xattr_handler v9fs_xattr_security_handler = {
+        .prefix = XATTR_SECURITY_PREFIX,
+        .get    = v9fs_xattr_handler_get,
+        .set    = v9fs_xattr_handler_set,
+};
+#endif
+
 const struct xattr_handler *v9fs_xattr_handlers[] = {
         &v9fs_xattr_user_handler,
         &v9fs_xattr_trusted_handler,
diff --git a/fs/9p/xattr.h b/fs/9p/xattr.h
index d3e2ea3840be..c63c3bea5de5 100644
--- a/fs/9p/xattr.h
+++ b/fs/9p/xattr.h
@@ -19,9 +19,6 @@
 #include <net/9p/client.h>
 
 extern const struct xattr_handler *v9fs_xattr_handlers[];
-extern struct xattr_handler v9fs_xattr_user_handler;
-extern struct xattr_handler v9fs_xattr_trusted_handler;
-extern struct xattr_handler v9fs_xattr_security_handler;
 extern const struct xattr_handler v9fs_xattr_acl_access_handler;
 extern const struct xattr_handler v9fs_xattr_acl_default_handler;
 
diff --git a/fs/9p/xattr_security.c b/fs/9p/xattr_security.c
deleted file mode 100644
index cb247a142a6e..000000000000
--- a/fs/9p/xattr_security.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright IBM Corporation, 2010
- * Author Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2.1 of the GNU Lesser General Public License
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-
-#include <linux/module.h>
-#include <linux/string.h>
-#include <linux/fs.h>
-#include <linux/slab.h>
-#include "xattr.h"
-
-static int v9fs_xattr_security_get(struct dentry *dentry, const char *name,
-                        void *buffer, size_t size, int type)
-{
-        int retval;
-        char *full_name;
-        size_t name_len;
-        size_t prefix_len = XATTR_SECURITY_PREFIX_LEN;
-
-        if (name == NULL)
-                return -EINVAL;
-
-        if (strcmp(name, "") == 0)
-                return -EINVAL;
-
-        name_len = strlen(name);
-        full_name = kmalloc(prefix_len + name_len + 1 , GFP_KERNEL);
-        if (!full_name)
-                return -ENOMEM;
-        memcpy(full_name, XATTR_SECURITY_PREFIX, prefix_len);
-        memcpy(full_name+prefix_len, name, name_len);
-        full_name[prefix_len + name_len] = '\0';
-
-        retval = v9fs_xattr_get(dentry, full_name, buffer, size);
-        kfree(full_name);
-        return retval;
-}
-
-static int v9fs_xattr_security_set(struct dentry *dentry, const char *name,
-                        const void *value, size_t size, int flags, int type)
-{
-        int retval;
-        char *full_name;
-        size_t name_len;
-        size_t prefix_len = XATTR_SECURITY_PREFIX_LEN;
-
-        if (name == NULL)
-                return -EINVAL;
-
-        if (strcmp(name, "") == 0)
-                return -EINVAL;
-
-        name_len = strlen(name);
-        full_name = kmalloc(prefix_len + name_len + 1 , GFP_KERNEL);
-        if (!full_name)
-                return -ENOMEM;
-        memcpy(full_name, XATTR_SECURITY_PREFIX, prefix_len);
-        memcpy(full_name + prefix_len, name, name_len);
-        full_name[prefix_len + name_len] = '\0';
-
-        retval = v9fs_xattr_set(dentry, full_name, value, size, flags);
-        kfree(full_name);
-        return retval;
-}
-
-struct xattr_handler v9fs_xattr_security_handler = {
-        .prefix = XATTR_SECURITY_PREFIX,
-        .get    = v9fs_xattr_security_get,
-        .set    = v9fs_xattr_security_set,
-};
diff --git a/fs/9p/xattr_trusted.c b/fs/9p/xattr_trusted.c
deleted file mode 100644
index e30d33b8a3fb..000000000000
--- a/fs/9p/xattr_trusted.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright IBM Corporation, 2010
- * Author Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2.1 of the GNU Lesser General Public License
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-
-#include <linux/module.h>
-#include <linux/string.h>
-#include <linux/fs.h>
-#include <linux/slab.h>
-#include "xattr.h"
-
-static int v9fs_xattr_trusted_get(struct dentry *dentry, const char *name,
-                        void *buffer, size_t size, int type)
-{
-        int retval;
-        char *full_name;
-        size_t name_len;
-        size_t prefix_len = XATTR_TRUSTED_PREFIX_LEN;
-
-        if (name == NULL)
-                return -EINVAL;
-
-        if (strcmp(name, "") == 0)
-                return -EINVAL;
-
-        name_len = strlen(name);
-        full_name = kmalloc(prefix_len + name_len + 1 , GFP_KERNEL);
-        if (!full_name)
-                return -ENOMEM;
-        memcpy(full_name, XATTR_TRUSTED_PREFIX, prefix_len);
-        memcpy(full_name+prefix_len, name, name_len);
-        full_name[prefix_len + name_len] = '\0';
-
-        retval = v9fs_xattr_get(dentry, full_name, buffer, size);
-        kfree(full_name);
-        return retval;
-}
-
-static int v9fs_xattr_trusted_set(struct dentry *dentry, const char *name,
-                        const void *value, size_t size, int flags, int type)
-{
-        int retval;
-        char *full_name;
-        size_t name_len;
-        size_t prefix_len = XATTR_TRUSTED_PREFIX_LEN;
-
-        if (name == NULL)
-                return -EINVAL;
-
-        if (strcmp(name, "") == 0)
-                return -EINVAL;
-
-        name_len = strlen(name);
-        full_name = kmalloc(prefix_len + name_len + 1 , GFP_KERNEL);
-        if (!full_name)
-                return -ENOMEM;
-        memcpy(full_name, XATTR_TRUSTED_PREFIX, prefix_len);
-        memcpy(full_name + prefix_len, name, name_len);
-        full_name[prefix_len + name_len] = '\0';
-
-        retval = v9fs_xattr_set(dentry, full_name, value, size, flags);
-        kfree(full_name);
-        return retval;
-}
-
-struct xattr_handler v9fs_xattr_trusted_handler = {
-        .prefix = XATTR_TRUSTED_PREFIX,
-        .get    = v9fs_xattr_trusted_get,
-        .set    = v9fs_xattr_trusted_set,
-};
diff --git a/fs/9p/xattr_user.c b/fs/9p/xattr_user.c
deleted file mode 100644
index d0b701b72080..000000000000
--- a/fs/9p/xattr_user.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright IBM Corporation, 2010
- * Author Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2.1 of the GNU Lesser General Public License
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-
-
-#include <linux/module.h>
-#include <linux/string.h>
-#include <linux/fs.h>
-#include <linux/slab.h>
-#include "xattr.h"
-
-static int v9fs_xattr_user_get(struct dentry *dentry, const char *name,
-                        void *buffer, size_t size, int type)
-{
-        int retval;
-        char *full_name;
-        size_t name_len;
-        size_t prefix_len = XATTR_USER_PREFIX_LEN;
-
-        if (name == NULL)
-                return -EINVAL;
-
-        if (strcmp(name, "") == 0)
-                return -EINVAL;
-
-        name_len = strlen(name);
-        full_name = kmalloc(prefix_len + name_len + 1 , GFP_KERNEL);
-        if (!full_name)
-                return -ENOMEM;
-        memcpy(full_name, XATTR_USER_PREFIX, prefix_len);
-        memcpy(full_name+prefix_len, name, name_len);
-        full_name[prefix_len + name_len] = '\0';
-
-        retval = v9fs_xattr_get(dentry, full_name, buffer, size);
-        kfree(full_name);
-        return retval;
-}
-
-static int v9fs_xattr_user_set(struct dentry *dentry, const char *name,
-                        const void *value, size_t size, int flags, int type)
-{
-        int retval;
-        char *full_name;
-        size_t name_len;
-        size_t prefix_len = XATTR_USER_PREFIX_LEN;
-
-        if (name == NULL)
-                return -EINVAL;
-
-        if (strcmp(name, "") == 0)
-                return -EINVAL;
-
-        name_len = strlen(name);
-        full_name = kmalloc(prefix_len + name_len + 1 , GFP_KERNEL);
-        if (!full_name)
-                return -ENOMEM;
-        memcpy(full_name, XATTR_USER_PREFIX, prefix_len);
-        memcpy(full_name + prefix_len, name, name_len);
-        full_name[prefix_len + name_len] = '\0';
-
-        retval = v9fs_xattr_set(dentry, full_name, value, size, flags);
-        kfree(full_name);
-        return retval;
-}
-
-struct xattr_handler v9fs_xattr_user_handler = {
-        .prefix = XATTR_USER_PREFIX,
-        .get    = v9fs_xattr_user_get,
-        .set    = v9fs_xattr_user_set,
-};
diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
index 0b6bfd3a398b..fa70848afa8f 100644
--- a/fs/ext2/xattr.c
+++ b/fs/ext2/xattr.c
@@ -293,10 +293,9 @@ bad_block:	ext2_error(inode->i_sb, "ext2_xattr_list",
                         ext2_xattr_handler(entry->e_name_index);
 
                 if (handler) {
-                        size_t size = handler->list(dentry, buffer, rest,
-                                                    entry->e_name,
-                                                    entry->e_name_len,
-                                                    handler->flags);
+                        size_t size = handler->list(handler, dentry, buffer,
+                                                    rest, entry->e_name,
+                                                    entry->e_name_len);
                         if (buffer) {
                                 if (size > rest) {
                                         error = -ERANGE;
diff --git a/fs/ext2/xattr_security.c b/fs/ext2/xattr_security.c
index 702fc6840246..dfb08750370d 100644
--- a/fs/ext2/xattr_security.c
+++ b/fs/ext2/xattr_security.c
@@ -8,8 +8,9 @@
 #include "xattr.h"
 
 static size_t
-ext2_xattr_security_list(struct dentry *dentry, char *list, size_t list_size,
-                         const char *name, size_t name_len, int type)
+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;
@@ -23,8 +24,9 @@ ext2_xattr_security_list(struct dentry *dentry, char *list, size_t list_size,
 }
 
 static int
-ext2_xattr_security_get(struct dentry *dentry, const char *name,
-                       void *buffer, size_t size, int type)
+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;
@@ -33,8 +35,9 @@ ext2_xattr_security_get(struct dentry *dentry, const char *name,
 }
 
 static int
-ext2_xattr_security_set(struct dentry *dentry, const char *name,
-                const void *value, size_t size, int flags, int type)
+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;
diff --git a/fs/ext2/xattr_trusted.c b/fs/ext2/xattr_trusted.c
index 42b6e9874bcc..3150dd3a7859 100644
--- a/fs/ext2/xattr_trusted.c
+++ b/fs/ext2/xattr_trusted.c
@@ -9,8 +9,9 @@
 #include "xattr.h"
 
 static size_t
-ext2_xattr_trusted_list(struct dentry *dentry, char *list, size_t list_size,
-                const char *name, size_t name_len, int type)
+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)
 {
         const int prefix_len = XATTR_TRUSTED_PREFIX_LEN;
         const size_t total_len = prefix_len + name_len + 1;
@@ -27,8 +28,9 @@ ext2_xattr_trusted_list(struct dentry *dentry, char *list, size_t list_size,
 }
 
 static int
-ext2_xattr_trusted_get(struct dentry *dentry, const char *name,
-                void *buffer, size_t size, int type)
+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;
@@ -37,8 +39,9 @@ ext2_xattr_trusted_get(struct dentry *dentry, const char *name,
 }
 
 static int
-ext2_xattr_trusted_set(struct dentry *dentry, const char *name,
-                const void *value, size_t size, int flags, int type)
+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;
diff --git a/fs/ext2/xattr_user.c b/fs/ext2/xattr_user.c
index ecdc4605192c..339a49bbb8ef 100644
--- a/fs/ext2/xattr_user.c
+++ b/fs/ext2/xattr_user.c
@@ -11,8 +11,9 @@
 #include "xattr.h"
 
 static size_t
-ext2_xattr_user_list(struct dentry *dentry, char *list, size_t list_size,
-                const char *name, size_t name_len, int type)
+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)
 {
         const size_t prefix_len = XATTR_USER_PREFIX_LEN;
         const size_t total_len = prefix_len + name_len + 1;
@@ -29,8 +30,9 @@ ext2_xattr_user_list(struct dentry *dentry, char *list, size_t list_size,
 }
 
 static int
-ext2_xattr_user_get(struct dentry *dentry, const char *name,
-                void *buffer, size_t size, int type)
+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;
@@ -41,8 +43,9 @@ ext2_xattr_user_get(struct dentry *dentry, const char *name,
 }
 
 static int
-ext2_xattr_user_set(struct dentry *dentry, const char *name,
-                const void *value, size_t size, int flags, int type)
+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;
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index 984448c6f5f0..6b6b3e751f8c 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -405,10 +405,9 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
                         ext4_xattr_handler(entry->e_name_index);
 
                 if (handler) {
-                        size_t size = handler->list(dentry, buffer, rest,
-                                                    entry->e_name,
-                                                    entry->e_name_len,
-                                                    handler->flags);
+                        size_t size = handler->list(handler, dentry, buffer,
+                                                    rest, entry->e_name,
+                                                    entry->e_name_len);
                         if (buffer) {
                                 if (size > rest)
                                         return -ERANGE;
diff --git a/fs/ext4/xattr_security.c b/fs/ext4/xattr_security.c
index 95d90e0560f0..36f4c1a84c21 100644
--- a/fs/ext4/xattr_security.c
+++ b/fs/ext4/xattr_security.c
@@ -12,8 +12,9 @@
 #include "xattr.h"
 
 static size_t
-ext4_xattr_security_list(struct dentry *dentry, char *list, size_t list_size,
-                const char *name, size_t name_len, int type)
+ext4_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 size_t prefix_len = sizeof(XATTR_SECURITY_PREFIX)-1;
         const size_t total_len = prefix_len + name_len + 1;
@@ -28,8 +29,9 @@ ext4_xattr_security_list(struct dentry *dentry, char *list, size_t list_size,
 }
 
 static int
-ext4_xattr_security_get(struct dentry *dentry, const char *name,
-                       void *buffer, size_t size, int type)
+ext4_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;
@@ -38,8 +40,9 @@ ext4_xattr_security_get(struct dentry *dentry, const char *name,
 }
 
 static int
-ext4_xattr_security_set(struct dentry *dentry, const char *name,
-                const void *value, size_t size, int flags, int type)
+ext4_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;
diff --git a/fs/ext4/xattr_trusted.c b/fs/ext4/xattr_trusted.c
index 891ee2ddfbd6..488089053342 100644
--- a/fs/ext4/xattr_trusted.c
+++ b/fs/ext4/xattr_trusted.c
@@ -13,8 +13,9 @@
 #include "xattr.h"
 
 static size_t
-ext4_xattr_trusted_list(struct dentry *dentry, char *list, size_t list_size,
-                const char *name, size_t name_len, int type)
+ext4_xattr_trusted_list(const struct xattr_handler *handler,
+                        struct dentry *dentry, char *list, size_t list_size,
+                        const char *name, size_t name_len)
 {
         const size_t prefix_len = XATTR_TRUSTED_PREFIX_LEN;
         const size_t total_len = prefix_len + name_len + 1;
@@ -31,8 +32,9 @@ ext4_xattr_trusted_list(struct dentry *dentry, char *list, size_t list_size,
 }
 
 static int
-ext4_xattr_trusted_get(struct dentry *dentry, const char *name, void *buffer,
-                size_t size, int type)
+ext4_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;
@@ -41,8 +43,9 @@ ext4_xattr_trusted_get(struct dentry *dentry, const char *name, void *buffer,
 }
 
 static int
-ext4_xattr_trusted_set(struct dentry *dentry, const char *name,
-                const void *value, size_t size, int flags, int type)
+ext4_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;
diff --git a/fs/ext4/xattr_user.c b/fs/ext4/xattr_user.c
index 6ed932b3c043..d2dec3364062 100644
--- a/fs/ext4/xattr_user.c
+++ b/fs/ext4/xattr_user.c
@@ -12,8 +12,9 @@
 #include "xattr.h"
 
 static size_t
-ext4_xattr_user_list(struct dentry *dentry, char *list, size_t list_size,
-                     const char *name, size_t name_len, int type)
+ext4_xattr_user_list(const struct xattr_handler *handler,
+                     struct dentry *dentry, char *list, size_t list_size,
+                     const char *name, size_t name_len)
 {
         const size_t prefix_len = XATTR_USER_PREFIX_LEN;
         const size_t total_len = prefix_len + name_len + 1;
@@ -30,8 +31,9 @@ ext4_xattr_user_list(struct dentry *dentry, char *list, size_t list_size,
 }
 
 static int
-ext4_xattr_user_get(struct dentry *dentry, const char *name,
-                    void *buffer, size_t size, int type)
+ext4_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;
@@ -42,8 +44,9 @@ ext4_xattr_user_get(struct dentry *dentry, const char *name,
 }
 
 static int
-ext4_xattr_user_set(struct dentry *dentry, const char *name,
-                    const void *value, size_t size, int flags, int type)
+ext4_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;
diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index 4de2286c0e4d..862368a32e53 100644
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -25,49 +25,45 @@
 #include "f2fs.h"
 #include "xattr.h"
 
-static size_t f2fs_xattr_generic_list(struct dentry *dentry, char *list,
-                size_t list_size, const char *name, size_t len, int type)
+static size_t f2fs_xattr_generic_list(const struct xattr_handler *handler,
+                struct dentry *dentry, char *list, size_t list_size,
+                const char *name, size_t len)
 {
         struct f2fs_sb_info *sbi = F2FS_SB(dentry->d_sb);
-        int total_len, prefix_len = 0;
-        const char *prefix = NULL;
+        int total_len, prefix_len;
 
-        switch (type) {
+        switch (handler->flags) {
         case F2FS_XATTR_INDEX_USER:
                 if (!test_opt(sbi, XATTR_USER))
                         return -EOPNOTSUPP;
-                prefix = XATTR_USER_PREFIX;
-                prefix_len = XATTR_USER_PREFIX_LEN;
                 break;
         case F2FS_XATTR_INDEX_TRUSTED:
                 if (!capable(CAP_SYS_ADMIN))
                         return -EPERM;
-                prefix = XATTR_TRUSTED_PREFIX;
-                prefix_len = XATTR_TRUSTED_PREFIX_LEN;
                 break;
         case F2FS_XATTR_INDEX_SECURITY:
-                prefix = XATTR_SECURITY_PREFIX;
-                prefix_len = XATTR_SECURITY_PREFIX_LEN;
                 break;
         default:
                 return -EINVAL;
         }
 
+        prefix_len = strlen(handler->prefix);
         total_len = prefix_len + len + 1;
         if (list && total_len <= list_size) {
-                memcpy(list, prefix, prefix_len);
+                memcpy(list, handler->prefix, prefix_len);
                 memcpy(list + prefix_len, name, len);
                 list[prefix_len + len] = '\0';
         }
         return total_len;
 }
 
-static int f2fs_xattr_generic_get(struct dentry *dentry, const char *name,
-                void *buffer, size_t size, int type)
+static int f2fs_xattr_generic_get(const struct xattr_handler *handler,
+                struct dentry *dentry, const char *name, void *buffer,
+                size_t size)
 {
         struct f2fs_sb_info *sbi = F2FS_SB(dentry->d_sb);
 
-        switch (type) {
+        switch (handler->flags) {
         case F2FS_XATTR_INDEX_USER:
                 if (!test_opt(sbi, XATTR_USER))
                         return -EOPNOTSUPP;
@@ -83,15 +79,17 @@ static int f2fs_xattr_generic_get(struct dentry *dentry, const char *name,
         }
         if (strcmp(name, "") == 0)
                 return -EINVAL;
-        return f2fs_getxattr(d_inode(dentry), type, name, buffer, size, NULL);
+        return f2fs_getxattr(d_inode(dentry), handler->flags, name,
+                             buffer, size, NULL);
 }
 
-static int f2fs_xattr_generic_set(struct dentry *dentry, const char *name,
-                const void *value, size_t size, int flags, int type)
+static int f2fs_xattr_generic_set(const struct xattr_handler *handler,
+                struct dentry *dentry, const char *name, const void *value,
+                size_t size, int flags)
 {
         struct f2fs_sb_info *sbi = F2FS_SB(dentry->d_sb);
 
-        switch (type) {
+        switch (handler->flags) {
         case F2FS_XATTR_INDEX_USER:
                 if (!test_opt(sbi, XATTR_USER))
                         return -EOPNOTSUPP;
@@ -108,27 +106,26 @@ static int f2fs_xattr_generic_set(struct dentry *dentry, const char *name,
         if (strcmp(name, "") == 0)
                 return -EINVAL;
 
-        return f2fs_setxattr(d_inode(dentry), type, name,
+        return f2fs_setxattr(d_inode(dentry), handler->flags, name,
                                         value, size, NULL, flags);
 }
 
-static size_t f2fs_xattr_advise_list(struct dentry *dentry, char *list,
-                size_t list_size, const char *name, size_t len, int type)
+static size_t f2fs_xattr_advise_list(const struct xattr_handler *handler,
+                struct dentry *dentry, char *list, size_t list_size,
+                const char *name, size_t len)
 {
         const char *xname = F2FS_SYSTEM_ADVISE_PREFIX;
         size_t size;
 
-        if (type != F2FS_XATTR_INDEX_ADVISE)
-                return 0;
-
         size = strlen(xname) + 1;
         if (list && size <= list_size)
                 memcpy(list, xname, size);
         return size;
 }
 
-static int f2fs_xattr_advise_get(struct dentry *dentry, const char *name,
-                void *buffer, size_t size, int type)
+static int f2fs_xattr_advise_get(const struct xattr_handler *handler,
+                struct dentry *dentry, const char *name, void *buffer,
+                size_t size)
 {
         struct inode *inode = d_inode(dentry);
 
@@ -140,8 +137,9 @@ static int f2fs_xattr_advise_get(struct dentry *dentry, const char *name,
         return sizeof(char);
 }
 
-static int f2fs_xattr_advise_set(struct dentry *dentry, const char *name,
-                const void *value, size_t size, int flags, int type)
+static int f2fs_xattr_advise_set(const struct xattr_handler *handler,
+                struct dentry *dentry, const char *name, const void *value,
+                size_t size, int flags)
 {
         struct inode *inode = d_inode(dentry);
 
@@ -462,8 +460,8 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
                 if (!handler)
                         continue;
 
-                size = handler->list(dentry, buffer, rest, entry->e_name,
-                                entry->e_name_len, handler->flags);
+                size = handler->list(handler, dentry, buffer, rest,
+                                     entry->e_name, entry->e_name_len);
                 if (buffer && size > rest) {
                         error = -ERANGE;
                         goto cleanup;
diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c
index 4c096fa9e2a1..53ce76a374fe 100644
--- a/fs/gfs2/xattr.c
+++ b/fs/gfs2/xattr.c
@@ -583,11 +583,13 @@ out:
  *
  * Returns: actual size of data on success, -errno on error
  */
-static int gfs2_xattr_get(struct dentry *dentry, const char *name,
-                void *buffer, size_t size, int type)
+static int gfs2_xattr_get(const struct xattr_handler *handler,
+                          struct dentry *dentry, const char *name,
+                          void *buffer, size_t size)
 {
         struct gfs2_inode *ip = GFS2_I(d_inode(dentry));
         struct gfs2_ea_location el;
+        int type = handler->flags;
         int error;
 
         if (!ip->i_eattr)
@@ -1227,11 +1229,12 @@ int __gfs2_xattr_set(struct inode *inode, const char *name,
         return error;
 }
 
-static int gfs2_xattr_set(struct dentry *dentry, const char *name,
-                const void *value, size_t size, int flags, int type)
+static int gfs2_xattr_set(const struct xattr_handler *handler,
+                          struct dentry *dentry, const char *name,
+                          const void *value, size_t size, int flags)
 {
         return __gfs2_xattr_set(d_inode(dentry), name, value,
-                                size, flags, type);
+                                size, flags, handler->flags);
 }
 
 
diff --git a/fs/hfsplus/xattr.c b/fs/hfsplus/xattr.c
index 416b1dbafe51..e41a010cd89c 100644
--- a/fs/hfsplus/xattr.c
+++ b/fs/hfsplus/xattr.c
@@ -849,8 +849,9 @@ end_removexattr:
         return err;
 }
 
-static int hfsplus_osx_getxattr(struct dentry *dentry, const char *name,
-                                        void *buffer, size_t size, int type)
+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;
@@ -871,8 +872,9 @@ static int hfsplus_osx_getxattr(struct dentry *dentry, const char *name,
         return __hfsplus_getxattr(d_inode(dentry), name, buffer, size);
 }
 
-static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,
-                const void *buffer, size_t size, int flags, int type)
+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;
@@ -893,19 +895,8 @@ static int hfsplus_osx_setxattr(struct dentry *dentry, const char *name,
         return __hfsplus_setxattr(d_inode(dentry), name, buffer, size, flags);
 }
 
-static size_t hfsplus_osx_listxattr(struct dentry *dentry, char *list,
-                size_t list_size, const char *name, size_t name_len, int type)
-{
-        /*
-         * This method is not used.
-         * It is used hfsplus_listxattr() instead of generic_listxattr().
-         */
-        return -EOPNOTSUPP;
-}
-
 const struct xattr_handler hfsplus_xattr_osx_handler = {
         .prefix = XATTR_MAC_OSX_PREFIX,
-        .list   = hfsplus_osx_listxattr,
         .get    = hfsplus_osx_getxattr,
         .set    = hfsplus_osx_setxattr,
 };
diff --git a/fs/hfsplus/xattr_security.c b/fs/hfsplus/xattr_security.c
index aacff00a9ff9..72a68a3a0c99 100644
--- a/fs/hfsplus/xattr_security.c
+++ b/fs/hfsplus/xattr_security.c
@@ -13,32 +13,24 @@
 #include "xattr.h"
 #include "acl.h"
 
-static int hfsplus_security_getxattr(struct dentry *dentry, const char *name,
-                                        void *buffer, size_t size, int type)
+static int hfsplus_security_getxattr(const struct xattr_handler *handler,
+                                     struct dentry *dentry, const char *name,
+                                     void *buffer, size_t size)
 {
         return hfsplus_getxattr(dentry, name, buffer, size,
                                 XATTR_SECURITY_PREFIX,
                                 XATTR_SECURITY_PREFIX_LEN);
 }
 
-static int hfsplus_security_setxattr(struct dentry *dentry, const char *name,
-                const void *buffer, size_t size, int flags, int type)
+static int hfsplus_security_setxattr(const struct xattr_handler *handler,
+                                     struct dentry *dentry, const char *name,
+                                     const void *buffer, size_t size, int flags)
 {
         return hfsplus_setxattr(dentry, name, buffer, size, flags,
                                 XATTR_SECURITY_PREFIX,
                                 XATTR_SECURITY_PREFIX_LEN);
 }
 
-static size_t hfsplus_security_listxattr(struct dentry *dentry, char *list,
-                size_t list_size, const char *name, size_t name_len, int type)
-{
-        /*
-         * This method is not used.
-         * It is used hfsplus_listxattr() instead of generic_listxattr().
-         */
-        return -EOPNOTSUPP;
-}
-
 static int hfsplus_initxattrs(struct inode *inode,
                                 const struct xattr *xattr_array,
                                 void *fs_info)
@@ -92,7 +84,6 @@ int hfsplus_init_inode_security(struct inode *inode,
 
 const struct xattr_handler hfsplus_xattr_security_handler = {
         .prefix = XATTR_SECURITY_PREFIX,
-        .list   = hfsplus_security_listxattr,
         .get    = hfsplus_security_getxattr,
         .set    = hfsplus_security_setxattr,
 };
diff --git a/fs/hfsplus/xattr_trusted.c b/fs/hfsplus/xattr_trusted.c
index bcf65089b7f7..95a7704c7abb 100644
--- a/fs/hfsplus/xattr_trusted.c
+++ b/fs/hfsplus/xattr_trusted.c
@@ -11,34 +11,25 @@
 #include "hfsplus_fs.h"
 #include "xattr.h"
 
-static int hfsplus_trusted_getxattr(struct dentry *dentry, const char *name,
-                                        void *buffer, size_t size, int type)
+static int hfsplus_trusted_getxattr(const struct xattr_handler *handler,
+                                    struct dentry *dentry, const char *name,
+                                    void *buffer, size_t size)
 {
         return hfsplus_getxattr(dentry, name, buffer, size,
                                 XATTR_TRUSTED_PREFIX,
                                 XATTR_TRUSTED_PREFIX_LEN);
 }
 
-static int hfsplus_trusted_setxattr(struct dentry *dentry, const char *name,
-                const void *buffer, size_t size, int flags, int type)
+static int hfsplus_trusted_setxattr(const struct xattr_handler *handler,
+                                    struct dentry *dentry, const char *name,
+                                    const void *buffer, size_t size, int flags)
 {
         return hfsplus_setxattr(dentry, name, buffer, size, flags,
                                 XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN);
 }
 
-static size_t hfsplus_trusted_listxattr(struct dentry *dentry, char *list,
-                size_t list_size, const char *name, size_t name_len, int type)
-{
-        /*
-         * This method is not used.
-         * It is used hfsplus_listxattr() instead of generic_listxattr().
-         */
-        return -EOPNOTSUPP;
-}
-
 const struct xattr_handler hfsplus_xattr_trusted_handler = {
         .prefix = XATTR_TRUSTED_PREFIX,
-        .list   = hfsplus_trusted_listxattr,
         .get    = hfsplus_trusted_getxattr,
         .set    = hfsplus_trusted_setxattr,
 };
diff --git a/fs/hfsplus/xattr_user.c b/fs/hfsplus/xattr_user.c
index 5aa0e6dc4a1e..6fc269baf959 100644
--- a/fs/hfsplus/xattr_user.c
+++ b/fs/hfsplus/xattr_user.c
@@ -11,34 +11,25 @@
 #include "hfsplus_fs.h"
 #include "xattr.h"
 
-static int hfsplus_user_getxattr(struct dentry *dentry, const char *name,
-                                        void *buffer, size_t size, int type)
+static int hfsplus_user_getxattr(const struct xattr_handler *handler,
+                                 struct dentry *dentry, const char *name,
+                                 void *buffer, size_t size)
 {
 
         return hfsplus_getxattr(dentry, name, buffer, size,
                                 XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN);
 }
 
-static int hfsplus_user_setxattr(struct dentry *dentry, const char *name,
-                const void *buffer, size_t size, int flags, int type)
+static int hfsplus_user_setxattr(const struct xattr_handler *handler,
+                                 struct dentry *dentry, const char *name,
+                                 const void *buffer, size_t size, int flags)
 {
         return hfsplus_setxattr(dentry, name, buffer, size, flags,
                                 XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN);
 }
 
-static size_t hfsplus_user_listxattr(struct dentry *dentry, char *list,
-                size_t list_size, const char *name, size_t name_len, int type)
-{
-        /*
-         * This method is not used.
-         * It is used hfsplus_listxattr() instead of generic_listxattr().
-         */
-        return -EOPNOTSUPP;
-}
-
 const struct xattr_handler hfsplus_xattr_user_handler = {
         .prefix = XATTR_USER_PREFIX,
-        .list   = hfsplus_user_listxattr,
         .get    = hfsplus_user_getxattr,
         .set    = hfsplus_user_setxattr,
 };
diff --git a/fs/jffs2/security.c b/fs/jffs2/security.c
index d4b43fb7adb1..bf12fe5f83d7 100644
--- a/fs/jffs2/security.c
+++ b/fs/jffs2/security.c
@@ -48,8 +48,9 @@ int jffs2_init_security(struct inode *inode, struct inode *dir,
 }
 
 /* ---- XATTR Handler for "security.*" ----------------- */
-static int jffs2_security_getxattr(struct dentry *dentry, const char *name,
-                                   void *buffer, size_t size, int type)
+static int jffs2_security_getxattr(const struct xattr_handler *handler,
+                                   struct dentry *dentry, const char *name,
+                                   void *buffer, size_t size)
 {
         if (!strcmp(name, ""))
                 return -EINVAL;
@@ -58,8 +59,9 @@ static int jffs2_security_getxattr(struct dentry *dentry, const char *name,
                                  name, buffer, size);
 }
 
-static int jffs2_security_setxattr(struct dentry *dentry, const char *name,
-                const void *buffer, size_t size, int flags, int type)
+static int jffs2_security_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;
@@ -68,8 +70,10 @@ static int jffs2_security_setxattr(struct dentry *dentry, const char *name,
                                  name, buffer, size, flags);
 }
 
-static size_t jffs2_security_listxattr(struct dentry *dentry, char *list,
-                size_t list_size, const char *name, size_t name_len, int type)
+static size_t jffs2_security_listxattr(const struct xattr_handler *handler,
+                                       struct dentry *dentry, char *list,
+                                       size_t list_size, const char *name,
+                                       size_t name_len)
 {
         size_t retlen = XATTR_SECURITY_PREFIX_LEN + name_len + 1;
 
diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c
index f092fee5be50..4c2c03663533 100644
--- a/fs/jffs2/xattr.c
+++ b/fs/jffs2/xattr.c
@@ -1001,11 +1001,12 @@ ssize_t jffs2_listxattr(struct dentry *dentry, char *buffer, size_t size)
                 if (!xhandle)
                         continue;
                 if (buffer) {
-                        rc = xhandle->list(dentry, buffer+len, size-len,
-                                           xd->xname, xd->name_len, xd->flags);
+                        rc = xhandle->list(xhandle, dentry, buffer + len,
+                                           size - len, xd->xname,
+                                           xd->name_len);
                 } else {
-                        rc = xhandle->list(dentry, NULL, 0, xd->xname,
-                                           xd->name_len, xd->flags);
+                        rc = xhandle->list(xhandle, dentry, NULL, 0,
+                                           xd->xname, xd->name_len);
                 }
                 if (rc < 0)
                         goto out;
diff --git a/fs/jffs2/xattr_trusted.c b/fs/jffs2/xattr_trusted.c
index ceaf9c693225..a562da0d6a26 100644
--- a/fs/jffs2/xattr_trusted.c
+++ b/fs/jffs2/xattr_trusted.c
@@ -16,8 +16,9 @@
 #include <linux/mtd/mtd.h>
 #include "nodelist.h"
 
-static int jffs2_trusted_getxattr(struct dentry *dentry, const char *name,
-                void *buffer, size_t size, int type)
+static int jffs2_trusted_getxattr(const struct xattr_handler *handler,
+                                  struct dentry *dentry, const char *name,
+                                  void *buffer, size_t size)
 {
         if (!strcmp(name, ""))
                 return -EINVAL;
@@ -25,8 +26,9 @@ static int jffs2_trusted_getxattr(struct dentry *dentry, const char *name,
                                  name, buffer, size);
 }
 
-static int jffs2_trusted_setxattr(struct dentry *dentry, const char *name,
-                const void *buffer, size_t size, int flags, int type)
+static int jffs2_trusted_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;
@@ -34,11 +36,16 @@ static int jffs2_trusted_setxattr(struct dentry *dentry, const char *name,
                                  name, buffer, size, flags);
 }
 
-static size_t jffs2_trusted_listxattr(struct dentry *dentry, char *list,
-                size_t list_size, const char *name, size_t name_len, int type)
+static size_t jffs2_trusted_listxattr(const struct xattr_handler *handler,
+                                      struct dentry *dentry, char *list,
+                                      size_t list_size, const char *name,
+                                      size_t name_len)
 {
         size_t retlen = XATTR_TRUSTED_PREFIX_LEN + name_len + 1;
 
+        if (!capable(CAP_SYS_ADMIN))
+                return 0;
+
         if (list && retlen<=list_size) {
                 strcpy(list, XATTR_TRUSTED_PREFIX);
                 strcpy(list + XATTR_TRUSTED_PREFIX_LEN, name);
diff --git a/fs/jffs2/xattr_user.c b/fs/jffs2/xattr_user.c
index a71391eba514..cbc0472e59a8 100644
--- a/fs/jffs2/xattr_user.c
+++ b/fs/jffs2/xattr_user.c
@@ -16,8 +16,9 @@
 #include <linux/mtd/mtd.h>
 #include "nodelist.h"
 
-static int jffs2_user_getxattr(struct dentry *dentry, const char *name,
-                               void *buffer, size_t size, int type)
+static int jffs2_user_getxattr(const struct xattr_handler *handler,
+                               struct dentry *dentry, const char *name,
+                               void *buffer, size_t size)
 {
         if (!strcmp(name, ""))
                 return -EINVAL;
@@ -25,8 +26,9 @@ static int jffs2_user_getxattr(struct dentry *dentry, const char *name,
                                  name, buffer, size);
 }
 
-static int jffs2_user_setxattr(struct dentry *dentry, const char *name,
-                const void *buffer, size_t size, int flags, int type)
+static int jffs2_user_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;
@@ -34,8 +36,10 @@ static int jffs2_user_setxattr(struct dentry *dentry, const char *name,
                                  name, buffer, size, flags);
 }
 
-static size_t jffs2_user_listxattr(struct dentry *dentry, char *list,
-                size_t list_size, const char *name, size_t name_len, int type)
+static size_t jffs2_user_listxattr(const struct xattr_handler *handler,
+                                   struct dentry *dentry, char *list,
+                                   size_t list_size, const char *name,
+                                   size_t name_len)
 {
         size_t retlen = XATTR_USER_PREFIX_LEN + name_len + 1;
 
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index ff5bddc49a2a..765a03559363 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -6248,9 +6248,10 @@ nfs4_release_lockowner(struct nfs_server *server, struct nfs4_lock_state *lsp)
 
 #define XATTR_NAME_NFSV4_ACL "system.nfs4_acl"
 
-static int nfs4_xattr_set_nfs4_acl(struct dentry *dentry, const char *key,
+static int nfs4_xattr_set_nfs4_acl(const struct xattr_handler *handler,
+                                   struct dentry *dentry, const char *key,
                                    const void *buf, size_t buflen,
-                                   int flags, int type)
+                                   int flags)
 {
         if (strcmp(key, "") != 0)
                 return -EINVAL;
@@ -6258,8 +6259,9 @@ static int nfs4_xattr_set_nfs4_acl(struct dentry *dentry, const char *key,
         return nfs4_proc_set_acl(d_inode(dentry), buf, buflen);
 }
 
-static int nfs4_xattr_get_nfs4_acl(struct dentry *dentry, const char *key,
-                                   void *buf, size_t buflen, int type)
+static int nfs4_xattr_get_nfs4_acl(const struct xattr_handler *handler,
+                                   struct dentry *dentry, const char *key,
+                                   void *buf, size_t buflen)
 {
         if (strcmp(key, "") != 0)
                 return -EINVAL;
@@ -6267,9 +6269,10 @@ static int nfs4_xattr_get_nfs4_acl(struct dentry *dentry, const char *key,
         return nfs4_proc_get_acl(d_inode(dentry), buf, buflen);
 }
 
-static size_t nfs4_xattr_list_nfs4_acl(struct dentry *dentry, char *list,
+static size_t nfs4_xattr_list_nfs4_acl(const struct xattr_handler *handler,
+                                       struct dentry *dentry, char *list,
                                        size_t list_len, const char *name,
-                                       size_t name_len, int type)
+                                       size_t name_len)
 {
         size_t len = sizeof(XATTR_NAME_NFSV4_ACL);
 
@@ -6287,9 +6290,10 @@ static inline int nfs4_server_supports_labels(struct nfs_server *server)
         return server->caps & NFS_CAP_SECURITY_LABEL;
 }
 
-static int nfs4_xattr_set_nfs4_label(struct dentry *dentry, const char *key,
-                                   const void *buf, size_t buflen,
-                                   int flags, int type)
+static int nfs4_xattr_set_nfs4_label(const struct xattr_handler *handler,
+                                     struct dentry *dentry, const char *key,
+                                     const void *buf, size_t buflen,
+                                     int flags)
 {
         if (security_ismaclabel(key))
                 return nfs4_set_security_label(dentry, buf, buflen);
@@ -6297,17 +6301,19 @@ static int nfs4_xattr_set_nfs4_label(struct dentry *dentry, const char *key,
         return -EOPNOTSUPP;
 }
 
-static int nfs4_xattr_get_nfs4_label(struct dentry *dentry, const char *key,
-                                   void *buf, size_t buflen, int type)
+static int nfs4_xattr_get_nfs4_label(const struct xattr_handler *handler,
+                                     struct dentry *dentry, const char *key,
+                                     void *buf, size_t buflen)
 {
         if (security_ismaclabel(key))
                 return nfs4_get_security_label(d_inode(dentry), buf, buflen);
         return -EOPNOTSUPP;
 }
 
-static size_t nfs4_xattr_list_nfs4_label(struct dentry *dentry, char *list,
-                                       size_t list_len, const char *name,
-                                       size_t name_len, int type)
+static size_t nfs4_xattr_list_nfs4_label(const struct xattr_handler *handler,
+                                         struct dentry *dentry, char *list,
+                                         size_t list_len, const char *name,
+                                         size_t name_len)
 {
         size_t len = 0;
 
diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index ebfdea78659b..e9164f09841b 100644
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -7229,9 +7229,10 @@ leave:
 /*
  * 'security' attributes support
  */
-static size_t ocfs2_xattr_security_list(struct dentry *dentry, char *list,
+static size_t ocfs2_xattr_security_list(const struct xattr_handler *handler,
+                                        struct dentry *dentry, char *list,
                                         size_t list_size, const char *name,
-                                        size_t name_len, int type)
+                                        size_t name_len)
 {
         const size_t prefix_len = XATTR_SECURITY_PREFIX_LEN;
         const size_t total_len = prefix_len + name_len + 1;
@@ -7244,8 +7245,9 @@ static size_t ocfs2_xattr_security_list(struct dentry *dentry, char *list,
         return total_len;
 }
 
-static int ocfs2_xattr_security_get(struct dentry *dentry, const char *name,
-                                    void *buffer, size_t size, int type)
+static int ocfs2_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;
@@ -7253,8 +7255,9 @@ static int ocfs2_xattr_security_get(struct dentry *dentry, const char *name,
                                name, buffer, size);
 }
 
-static int ocfs2_xattr_security_set(struct dentry *dentry, const char *name,
-                const void *value, size_t size, int flags, int type)
+static int ocfs2_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;
@@ -7319,9 +7322,10 @@ const struct xattr_handler ocfs2_xattr_security_handler = {
 /*
  * 'trusted' attributes support
  */
-static size_t ocfs2_xattr_trusted_list(struct dentry *dentry, char *list,
+static size_t ocfs2_xattr_trusted_list(const struct xattr_handler *handler,
+                                       struct dentry *dentry, char *list,
                                        size_t list_size, const char *name,
-                                       size_t name_len, int type)
+                                       size_t name_len)
 {
         const size_t prefix_len = XATTR_TRUSTED_PREFIX_LEN;
         const size_t total_len = prefix_len + name_len + 1;
@@ -7337,8 +7341,9 @@ static size_t ocfs2_xattr_trusted_list(struct dentry *dentry, char *list,
         return total_len;
 }
 
-static int ocfs2_xattr_trusted_get(struct dentry *dentry, const char *name,
-                void *buffer, size_t size, int type)
+static int ocfs2_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;
@@ -7346,8 +7351,9 @@ static int ocfs2_xattr_trusted_get(struct dentry *dentry, const char *name,
                                name, buffer, size);
 }
 
-static int ocfs2_xattr_trusted_set(struct dentry *dentry, const char *name,
-                const void *value, size_t size, int flags, int type)
+static int ocfs2_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;
@@ -7366,9 +7372,10 @@ const struct xattr_handler ocfs2_xattr_trusted_handler = {
 /*
  * 'user' attributes support
  */
-static size_t ocfs2_xattr_user_list(struct dentry *dentry, char *list,
+static size_t ocfs2_xattr_user_list(const struct xattr_handler *handler,
+                                    struct dentry *dentry, char *list,
                                     size_t list_size, const char *name,
-                                    size_t name_len, int type)
+                                    size_t name_len)
 {
         const size_t prefix_len = XATTR_USER_PREFIX_LEN;
         const size_t total_len = prefix_len + name_len + 1;
@@ -7385,8 +7392,9 @@ static size_t ocfs2_xattr_user_list(struct dentry *dentry, char *list,
         return total_len;
 }
 
-static int ocfs2_xattr_user_get(struct dentry *dentry, const char *name,
-                void *buffer, size_t size, int type)
+static int ocfs2_xattr_user_get(const struct xattr_handler *handler,
+                                struct dentry *dentry, const char *name,
+                                void *buffer, size_t size)
 {
         struct ocfs2_super *osb = OCFS2_SB(dentry->d_sb);
 
@@ -7398,8 +7406,9 @@ static int ocfs2_xattr_user_get(struct dentry *dentry, const char *name,
                                buffer, size);
 }
 
-static int ocfs2_xattr_user_set(struct dentry *dentry, const char *name,
-                const void *value, size_t size, int flags, int type)
+static int ocfs2_xattr_user_set(const struct xattr_handler *handler,
+                                struct dentry *dentry, const char *name,
+                                const void *value, size_t size, int flags)
 {
         struct ocfs2_super *osb = OCFS2_SB(dentry->d_sb);
 
diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 4fb17ded7d47..4adde1e2cbec 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -762,18 +762,21 @@ posix_acl_to_xattr(struct user_namespace *user_ns, const struct posix_acl *acl,
 EXPORT_SYMBOL (posix_acl_to_xattr);
 
 static int
-posix_acl_xattr_get(struct dentry *dentry, const char *name,
-                void *value, size_t size, int type)
+posix_acl_xattr_get(const struct xattr_handler *handler,
+                    struct dentry *dentry, const char *name,
+                    void *value, size_t size)
 {
         struct posix_acl *acl;
         int error;
 
+        if (strcmp(name, "") != 0)
+                return -EINVAL;
         if (!IS_POSIXACL(d_backing_inode(dentry)))
                 return -EOPNOTSUPP;
         if (d_is_symlink(dentry))
                 return -EOPNOTSUPP;
 
-        acl = get_acl(d_backing_inode(dentry), type);
+        acl = get_acl(d_backing_inode(dentry), handler->flags);
         if (IS_ERR(acl))
                 return PTR_ERR(acl);
         if (acl == NULL)
@@ -786,19 +789,22 @@ posix_acl_xattr_get(struct dentry *dentry, const char *name,
 }
 
 static int
-posix_acl_xattr_set(struct dentry *dentry, const char *name,
-                const void *value, size_t size, int flags, int type)
+posix_acl_xattr_set(const struct xattr_handler *handler,
+                    struct dentry *dentry, const char *name,
+                    const void *value, size_t size, int flags)
 {
         struct inode *inode = d_backing_inode(dentry);
         struct posix_acl *acl = NULL;
         int ret;
 
+        if (strcmp(name, "") != 0)
+                return -EINVAL;
         if (!IS_POSIXACL(inode))
                 return -EOPNOTSUPP;
         if (!inode->i_op->set_acl)
                 return -EOPNOTSUPP;
 
-        if (type == ACL_TYPE_DEFAULT && !S_ISDIR(inode->i_mode))
+        if (handler->flags == ACL_TYPE_DEFAULT && !S_ISDIR(inode->i_mode))
                 return value ? -EACCES : 0;
         if (!inode_owner_or_capable(inode))
                 return -EPERM;
@@ -815,28 +821,22 @@ posix_acl_xattr_set(struct dentry *dentry, const char *name,
                 }
         }
 
-        ret = inode->i_op->set_acl(inode, acl, type);
+        ret = inode->i_op->set_acl(inode, acl, handler->flags);
 out:
         posix_acl_release(acl);
         return ret;
 }
 
 static size_t
-posix_acl_xattr_list(struct dentry *dentry, char *list, size_t list_size,
-                const char *name, size_t name_len, int type)
+posix_acl_xattr_list(const struct xattr_handler *handler,
+                     struct dentry *dentry, char *list, size_t list_size,
+                     const char *name, size_t name_len)
 {
-        const char *xname;
+        const char *xname = handler->prefix;
         size_t size;
 
         if (!IS_POSIXACL(d_backing_inode(dentry)))
-                return -EOPNOTSUPP;
-        if (d_is_symlink(dentry))
-                return -EOPNOTSUPP;
-
-        if (type == ACL_TYPE_ACCESS)
-                xname = POSIX_ACL_XATTR_ACCESS;
-        else
-                xname = POSIX_ACL_XATTR_DEFAULT;
+                return 0;
 
         size = strlen(xname) + 1;
         if (list && size <= list_size)
diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c
index e87f9b52bf06..66b26fdfff8d 100644
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
@@ -778,7 +778,7 @@ reiserfs_getxattr(struct dentry * dentry, const char *name, void *buffer,
         if (!handler || get_inode_sd_version(d_inode(dentry)) == STAT_DATA_V1)
                 return -EOPNOTSUPP;
 
-        return handler->get(dentry, name, buffer, size, handler->flags);
+        return handler->get(handler, dentry, name, buffer, size);
 }
 
 /*
@@ -797,7 +797,7 @@ reiserfs_setxattr(struct dentry *dentry, const char *name, const void *value,
         if (!handler || get_inode_sd_version(d_inode(dentry)) == STAT_DATA_V1)
                 return -EOPNOTSUPP;
 
-        return handler->set(dentry, name, value, size, flags, handler->flags);
+        return handler->set(handler, dentry, name, value, size, flags);
 }
 
 /*
@@ -814,7 +814,7 @@ int reiserfs_removexattr(struct dentry *dentry, const char *name)
         if (!handler || get_inode_sd_version(d_inode(dentry)) == STAT_DATA_V1)
                 return -EOPNOTSUPP;
 
-        return handler->set(dentry, name, NULL, 0, XATTR_REPLACE, handler->flags);
+        return handler->set(handler, dentry, name, NULL, 0, XATTR_REPLACE);
 }
 
 struct listxattr_buf {
@@ -842,14 +842,14 @@ static int listxattr_filler(struct dir_context *ctx, const char *name,
                 if (!handler)   /* Unsupported xattr name */
                         return 0;
                 if (b->buf) {
-                        size = handler->list(b->dentry, b->buf + b->pos,
-                                         b->size, name, namelen,
-                                         handler->flags);
+                        size = handler->list(handler, b->dentry,
+                                             b->buf + b->pos, b->size, name,
+                                             namelen);
                         if (size > b->size)
                                 return -ERANGE;
                 } else {
-                        size = handler->list(b->dentry, NULL, 0, name,
-                                             namelen, handler->flags);
+                        size = handler->list(handler, b->dentry,
+                                             NULL, 0, name, namelen);
                 }
 
                 b->pos += size;
diff --git a/fs/reiserfs/xattr_security.c b/fs/reiserfs/xattr_security.c
index 9a3b0616f283..ac659af431ae 100644
--- a/fs/reiserfs/xattr_security.c
+++ b/fs/reiserfs/xattr_security.c
@@ -9,8 +9,8 @@
 #include <linux/uaccess.h>
 
 static int
-security_get(struct dentry *dentry, const char *name, void *buffer, size_t size,
-                int handler_flags)
+security_get(const struct xattr_handler *handler, struct dentry *dentry,
+             const char *name, void *buffer, size_t size)
 {
         if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX))
                 return -EINVAL;
@@ -22,8 +22,8 @@ security_get(struct dentry *dentry, const char *name, void *buffer, size_t size,
 }
 
 static int
-security_set(struct dentry *dentry, const char *name, const void *buffer,
-             size_t size, int flags, int handler_flags)
+security_set(const struct xattr_handler *handler, struct dentry *dentry,
+             const char *name, const void *buffer, size_t size, int flags)
 {
         if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX))
                 return -EINVAL;
@@ -34,8 +34,9 @@ security_set(struct dentry *dentry, const char *name, const void *buffer,
         return reiserfs_xattr_set(d_inode(dentry), name, buffer, size, flags);
 }
 
-static size_t security_list(struct dentry *dentry, char *list, size_t list_len,
-                            const char *name, size_t namelen, int handler_flags)
+static size_t security_list(const struct xattr_handler *handler,
+                            struct dentry *dentry, char *list, size_t list_len,
+                            const char *name, size_t namelen)
 {
         const size_t len = namelen + 1;
 
diff --git a/fs/reiserfs/xattr_trusted.c b/fs/reiserfs/xattr_trusted.c
index e4f1343714e0..a338adf1b8b4 100644
--- a/fs/reiserfs/xattr_trusted.c
+++ b/fs/reiserfs/xattr_trusted.c
@@ -8,8 +8,8 @@
 #include <linux/uaccess.h>
 
 static int
-trusted_get(struct dentry *dentry, const char *name, void *buffer, size_t size,
-            int handler_flags)
+trusted_get(const struct xattr_handler *handler, struct dentry *dentry,
+            const char *name, void *buffer, size_t size)
 {
         if (strlen(name) < sizeof(XATTR_TRUSTED_PREFIX))
                 return -EINVAL;
@@ -21,8 +21,8 @@ trusted_get(struct dentry *dentry, const char *name, void *buffer, size_t size,
 }
 
 static int
-trusted_set(struct dentry *dentry, const char *name, const void *buffer,
-            size_t size, int flags, int handler_flags)
+trusted_set(const struct xattr_handler *handler, struct dentry *dentry,
+            const char *name, const void *buffer, size_t size, int flags)
 {
         if (strlen(name) < sizeof(XATTR_TRUSTED_PREFIX))
                 return -EINVAL;
@@ -33,8 +33,9 @@ trusted_set(struct dentry *dentry, const char *name, const void *buffer,
         return reiserfs_xattr_set(d_inode(dentry), name, buffer, size, flags);
 }
 
-static size_t trusted_list(struct dentry *dentry, char *list, size_t list_size,
-                           const char *name, size_t name_len, int handler_flags)
+static size_t trusted_list(const struct xattr_handler *handler,
+                           struct dentry *dentry, char *list, size_t list_size,
+                           const char *name, size_t name_len)
 {
         const size_t len = name_len + 1;
 
diff --git a/fs/reiserfs/xattr_user.c b/fs/reiserfs/xattr_user.c
index d0b08d3e5689..39c9667191c5 100644
--- a/fs/reiserfs/xattr_user.c
+++ b/fs/reiserfs/xattr_user.c
@@ -7,8 +7,8 @@
 #include <linux/uaccess.h>
 
 static int
-user_get(struct dentry *dentry, const char *name, void *buffer, size_t size,
-         int handler_flags)
+user_get(const struct xattr_handler *handler, struct dentry *dentry,
+         const char *name, void *buffer, size_t size)
 {
 
         if (strlen(name) < sizeof(XATTR_USER_PREFIX))
@@ -19,8 +19,8 @@ user_get(struct dentry *dentry, const char *name, void *buffer, size_t size,
 }
 
 static int
-user_set(struct dentry *dentry, const char *name, const void *buffer,
-         size_t size, int flags, int handler_flags)
+user_set(const struct xattr_handler *handler, struct dentry *dentry,
+         const char *name, const void *buffer, size_t size, int flags)
 {
         if (strlen(name) < sizeof(XATTR_USER_PREFIX))
                 return -EINVAL;
@@ -30,8 +30,9 @@ user_set(struct dentry *dentry, const char *name, const void *buffer,
         return reiserfs_xattr_set(d_inode(dentry), name, buffer, size, flags);
 }
 
-static size_t user_list(struct dentry *dentry, char *list, size_t list_size,
-                        const char *name, size_t name_len, int handler_flags)
+static size_t user_list(const struct xattr_handler *handler,
+                        struct dentry *dentry, char *list, size_t list_size,
+                        const char *name, size_t name_len)
 {
         const size_t len = name_len + 1;
 
diff --git a/fs/squashfs/xattr.c b/fs/squashfs/xattr.c
index e5e0ddf5b143..6a4cc344085c 100644
--- a/fs/squashfs/xattr.c
+++ b/fs/squashfs/xattr.c
@@ -68,8 +68,8 @@ ssize_t squashfs_listxattr(struct dentry *d, char *buffer,
                 name_size = le16_to_cpu(entry.size);
                 handler = squashfs_xattr_handler(le16_to_cpu(entry.type));
                 if (handler)
-                        prefix_size = handler->list(d, buffer, rest, NULL,
-                                name_size, handler->flags);
+                        prefix_size = handler->list(handler, d, buffer, rest,
+                                                    NULL, name_size);
                 if (prefix_size) {
                         if (buffer) {
                                 if (prefix_size + name_size + 1 > rest) {
@@ -212,88 +212,68 @@ failed:
 }
 
 
-/*
- * User namespace support
- */
-static size_t squashfs_user_list(struct dentry *d, char *list, size_t list_size,
-        const char *name, size_t name_len, int type)
+static size_t squashfs_xattr_handler_list(const struct xattr_handler *handler,
+                                          struct dentry *d, char *list,
+                                          size_t list_size, const char *name,
+                                          size_t name_len)
 {
-        if (list && XATTR_USER_PREFIX_LEN <= list_size)
-                memcpy(list, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN);
-        return XATTR_USER_PREFIX_LEN;
+        int len = strlen(handler->prefix);
+
+        if (list && len <= list_size)
+                memcpy(list, handler->prefix, len);
+        return len;
 }
 
-static int squashfs_user_get(struct dentry *d, const char *name, void *buffer,
-        size_t size, int type)
+static int squashfs_xattr_handler_get(const struct xattr_handler *handler,
+                                      struct dentry *d, const char *name,
+                                      void *buffer, size_t size)
 {
         if (name[0] == '\0')
                 return  -EINVAL;
 
-        return squashfs_xattr_get(d_inode(d), SQUASHFS_XATTR_USER, name,
+        return squashfs_xattr_get(d_inode(d), handler->flags, name,
                 buffer, size);
 }
 
+/*
+ * User namespace support
+ */
 static const struct xattr_handler squashfs_xattr_user_handler = {
         .prefix = XATTR_USER_PREFIX,
-        .list   = squashfs_user_list,
-        .get    = squashfs_user_get
+        .flags  = SQUASHFS_XATTR_USER,
+        .list   = squashfs_xattr_handler_list,
+        .get    = squashfs_xattr_handler_get
 };
 
 /*
  * Trusted namespace support
  */
-static size_t squashfs_trusted_list(struct dentry *d, char *list,
-        size_t list_size, const char *name, size_t name_len, int type)
+static size_t squashfs_trusted_xattr_handler_list(const struct xattr_handler *handler,
+                                                  struct dentry *d, char *list,
+                                                  size_t list_size, const char *name,
+                                                  size_t name_len)
 {
         if (!capable(CAP_SYS_ADMIN))
                 return 0;
-
-        if (list && XATTR_TRUSTED_PREFIX_LEN <= list_size)
-                memcpy(list, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN);
-        return XATTR_TRUSTED_PREFIX_LEN;
-}
-
-static int squashfs_trusted_get(struct dentry *d, const char *name,
-        void *buffer, size_t size, int type)
-{
-        if (name[0] == '\0')
-                return  -EINVAL;
-
-        return squashfs_xattr_get(d_inode(d), SQUASHFS_XATTR_TRUSTED, name,
-                buffer, size);
+        return squashfs_xattr_handler_list(handler, d, list, list_size, name,
+                                           name_len);
 }
 
 static const struct xattr_handler squashfs_xattr_trusted_handler = {
         .prefix = XATTR_TRUSTED_PREFIX,
-        .list   = squashfs_trusted_list,
-        .get    = squashfs_trusted_get
+        .flags  = SQUASHFS_XATTR_TRUSTED,
+        .list   = squashfs_trusted_xattr_handler_list,
+        .get    = squashfs_xattr_handler_get
 };
 
 /*
  * Security namespace support
  */
-static size_t squashfs_security_list(struct dentry *d, char *list,
-        size_t list_size, const char *name, size_t name_len, int type)
-{
-        if (list && XATTR_SECURITY_PREFIX_LEN <= list_size)
-                memcpy(list, XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN);
-        return XATTR_SECURITY_PREFIX_LEN;
-}
-
-static int squashfs_security_get(struct dentry *d, const char *name,
-        void *buffer, size_t size, int type)
-{
-        if (name[0] == '\0')
-                return  -EINVAL;
-
-        return squashfs_xattr_get(d_inode(d), SQUASHFS_XATTR_SECURITY, name,
-                buffer, size);
-}
-
 static const struct xattr_handler squashfs_xattr_security_handler = {
         .prefix = XATTR_SECURITY_PREFIX,
-        .list   = squashfs_security_list,
-        .get    = squashfs_security_get
+        .flags  = SQUASHFS_XATTR_SECURITY,
+        .list   = squashfs_xattr_handler_list,
+        .get    = squashfs_xattr_handler_get
 };
 
 static const struct xattr_handler *squashfs_xattr_handler(int type)
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 8ee3133dd8e4..1fd90c079537 100644
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -2040,7 +2040,6 @@ static int ubifs_fill_super(struct super_block *sb, void *data, int silent)
         if (c->max_inode_sz > MAX_LFS_FILESIZE)
                 sb->s_maxbytes = c->max_inode_sz = MAX_LFS_FILESIZE;
         sb->s_op = &ubifs_super_operations;
-        sb->s_xattr = ubifs_xattr_handlers;
 
         mutex_lock(&c->umount_mutex);
         err = mount_ubifs(c);
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 01142e129d16..a5697de763f5 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -1470,7 +1470,6 @@ extern spinlock_t ubifs_infos_lock;
 extern atomic_long_t ubifs_clean_zn_cnt;
 extern struct kmem_cache *ubifs_inode_slab;
 extern const struct super_operations ubifs_super_operations;
-extern const struct xattr_handler *ubifs_xattr_handlers[];
 extern const struct address_space_operations ubifs_file_address_operations;
 extern const struct file_operations ubifs_file_operations;
 extern const struct inode_operations ubifs_file_inode_operations;
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index 259fbabf143d..e8b01b721e99 100644
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -588,46 +588,6 @@ out_free:
         return err;
 }
 
-static size_t security_listxattr(struct dentry *d, char *list, size_t list_size,
-                                 const char *name, size_t name_len, int flags)
-{
-        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 security_getxattr(struct dentry *d, const char *name, void *buffer,
-                      size_t size, int flags)
-{
-        return ubifs_getxattr(d, name, buffer, size);
-}
-
-static int security_setxattr(struct dentry *d, const char *name,
-                             const void *value, size_t size, int flags,
-                             int handler_flags)
-{
-        return ubifs_setxattr(d, name, value, size, flags);
-}
-
-static const struct xattr_handler ubifs_xattr_security_handler = {
-        .prefix = XATTR_SECURITY_PREFIX,
-        .list   = security_listxattr,
-        .get    = security_getxattr,
-        .set    = security_setxattr,
-};
-
-const struct xattr_handler *ubifs_xattr_handlers[] = {
-        &ubifs_xattr_security_handler,
-        NULL,
-};
-
 static int init_xattrs(struct inode *inode, const struct xattr *xattr_array,
                       void *fs_info)
 {
diff --git a/fs/xattr.c b/fs/xattr.c
index 072fee1258dd..9b932b95d74e 100644
--- a/fs/xattr.c
+++ b/fs/xattr.c
@@ -720,7 +720,7 @@ generic_getxattr(struct dentry *dentry, const char *name, void *buffer, size_t s
         handler = xattr_resolve_name(dentry->d_sb->s_xattr, &name);
         if (!handler)
                 return -EOPNOTSUPP;
-        return handler->get(dentry, name, buffer, size, handler->flags);
+        return handler->get(handler, dentry, name, buffer, size);
 }
 
 /*
@@ -735,15 +735,15 @@ generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size)
 
         if (!buffer) {
                 for_each_xattr_handler(handlers, handler) {
-                        size += handler->list(dentry, NULL, 0, NULL, 0,
-                                              handler->flags);
+                        size += handler->list(handler, dentry, NULL, 0,
+                                              NULL, 0);
                 }
         } else {
                 char *buf = buffer;
 
                 for_each_xattr_handler(handlers, handler) {
-                        size = handler->list(dentry, buf, buffer_size,
-                                             NULL, 0, handler->flags);
+                        size = handler->list(handler, dentry, buf, buffer_size,
+                                             NULL, 0);
                         if (size > buffer_size)
                                 return -ERANGE;
                         buf += size;
@@ -767,7 +767,7 @@ generic_setxattr(struct dentry *dentry, const char *name, const void *value, siz
         handler = xattr_resolve_name(dentry->d_sb->s_xattr, &name);
         if (!handler)
                 return -EOPNOTSUPP;
-        return handler->set(dentry, name, value, size, flags, handler->flags);
+        return handler->set(handler, dentry, name, value, size, flags);
 }
 
 /*
@@ -782,8 +782,7 @@ generic_removexattr(struct dentry *dentry, const char *name)
         handler = xattr_resolve_name(dentry->d_sb->s_xattr, &name);
         if (!handler)
                 return -EOPNOTSUPP;
-        return handler->set(dentry, name, NULL, 0,
-                            XATTR_REPLACE, handler->flags);
+        return handler->set(handler, dentry, name, NULL, 0, XATTR_REPLACE);
 }
 
 EXPORT_SYMBOL(generic_getxattr);
@@ -791,6 +790,30 @@ EXPORT_SYMBOL(generic_listxattr);
 EXPORT_SYMBOL(generic_setxattr);
 EXPORT_SYMBOL(generic_removexattr);
 
+/**
+ * xattr_full_name  -  Compute full attribute name from suffix
+ *
+ * @handler:    handler of the xattr_handler operation
+ * @name:       name passed to the xattr_handler operation
+ *
+ * The get and set xattr handler operations are called with the remainder of
+ * the attribute name after skipping the handler's prefix: for example, "foo"
+ * is passed to the get operation of a handler with prefix "user." to get
+ * attribute "user.foo".  The full name is still "there" in the name though.
+ *
+ * Note: the list xattr handler operation when called from the vfs is passed a
+ * NULL name; some file systems use this operation internally, with varying
+ * semantics.
+ */
+const char *xattr_full_name(const struct xattr_handler *handler,
+                            const char *name)
+{
+        size_t prefix_len = strlen(handler->prefix);
+
+        return name - prefix_len;
+}
+EXPORT_SYMBOL(xattr_full_name);
+
 /*
  * Allocate new xattr and copy in the value; but leave the name to callers.
  */
diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c
index 8294f86441bf..839b35ca21c6 100644
--- a/fs/xfs/xfs_xattr.c
+++ b/fs/xfs/xfs_xattr.c
@@ -32,9 +32,10 @@
 
 
 static int
-xfs_xattr_get(struct dentry *dentry, const char *name,
-                void *value, size_t size, int xflags)
+xfs_xattr_get(const struct xattr_handler *handler, struct dentry *dentry,
+                const char *name, void *value, size_t size)
 {
+        int xflags = handler->flags;
         struct xfs_inode *ip = XFS_I(d_inode(dentry));
         int error, asize = size;
 
@@ -76,9 +77,10 @@ xfs_forget_acl(
 }
 
 static int
-xfs_xattr_set(struct dentry *dentry, const char *name, const void *value,
-                size_t size, int flags, int xflags)
+xfs_xattr_set(const struct xattr_handler *handler, struct dentry *dentry,
+                const char *name, const void *value, size_t size, int flags)
 {
+        int                     xflags = handler->flags;
         struct xfs_inode        *ip = XFS_I(d_inode(dentry));
         int                     error;
 
diff --git a/include/linux/xattr.h b/include/linux/xattr.h
index 91b0a68d38dc..89474b9d260c 100644
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
@@ -21,15 +21,19 @@ struct dentry;
 
 struct xattr_handler {
         const char *prefix;
-        int flags;      /* fs private flags passed back to the handlers */
-        size_t (*list)(struct dentry *dentry, char *list, size_t list_size,
-                       const char *name, size_t name_len, int handler_flags);
-        int (*get)(struct dentry *dentry, const char *name, void *buffer,
-                   size_t size, int handler_flags);
-        int (*set)(struct dentry *dentry, const char *name, const void *buffer,
-                   size_t size, int flags, int handler_flags);
+        int flags;      /* fs private flags */
+        size_t (*list)(const struct xattr_handler *, struct dentry *dentry,
+                       char *list, size_t list_size, const char *name,
+                       size_t name_len);
+        int (*get)(const struct xattr_handler *, struct dentry *dentry,
+                   const char *name, void *buffer, size_t size);
+        int (*set)(const struct xattr_handler *, struct dentry *dentry,
+                   const char *name, const void *buffer, size_t size,
+                   int flags);
 };
 
+const char *xattr_full_name(const struct xattr_handler *, const char *);
+
 struct xattr {
         const char *name;
         void *value;