orangefs: Remove redundant "trusted." xattr handler

Orangefs has a catch-all xattr handler that effectively does what the
trusted handler does already.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>

diff --git a/fs/orangefs/xattr.c b/fs/orangefs/xattr.c
index f387e8ad477b220912ea6a5f00e4ef7af19ca411..640a98f9144d66cbb9b2575f582b26f4fec62812 100644 (file)
--- a/fs/orangefs/xattr.c
+++ b/fs/orangefs/xattr.c
@@ -478,42 +478,6 @@ static int orangefs_xattr_get_default(const struct xattr_handler *handler,
 
 }
 
-static int orangefs_xattr_set_trusted(const struct xattr_handler *handler,
-                                    struct dentry *unused,
-                                    struct inode *inode,
-                                    const char *name,
-                                    const void *buffer,
-                                    size_t size,
-                                    int flags)
-{
-       return orangefs_inode_setxattr(inode,
-                                   XATTR_TRUSTED_PREFIX,
-                                   name,
-                                   buffer,
-                                   size,
-                                   flags);
-}
-
-static int orangefs_xattr_get_trusted(const struct xattr_handler *handler,
-                                     struct dentry *unused,
-                                     struct inode *inode,
-                                     const char *name,
-                                     void *buffer,
-                                     size_t size)
-{
-       return orangefs_inode_getxattr(inode,
-                                   XATTR_TRUSTED_PREFIX,
-                                   name,
-                                   buffer,
-                                   size);
-}
-
-static struct xattr_handler orangefs_xattr_trusted_handler = {
-       .prefix = XATTR_TRUSTED_PREFIX,
-       .get = orangefs_xattr_get_trusted,
-       .set = orangefs_xattr_set_trusted,
-};
-
 static struct xattr_handler orangefs_xattr_default_handler = {
        .prefix = "",  /* match any name => handlers called with full name */
        .get = orangefs_xattr_get_default,
@@ -523,7 +487,6 @@ static struct xattr_handler orangefs_xattr_default_handler = {
 const struct xattr_handler *orangefs_xattr_handlers[] = {
        &posix_acl_access_xattr_handler,
        &posix_acl_default_xattr_handler,
-       &orangefs_xattr_trusted_handler,
        &orangefs_xattr_default_handler,
        NULL
 };