From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:42933 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752681AbcEYK3n (ORCPT ); Wed, 25 May 2016 06:29:43 -0400 From: Andreas Gruenbacher To: Mike Marshall Cc: Andreas Gruenbacher , linux-fsdevel@vger.kernel.org Subject: [PATCH 2/3] orangefs: Remove redundant "trusted." xattr handler Date: Wed, 25 May 2016 12:29:33 +0200 Message-Id: <1464172174-29237-3-git-send-email-agruenba@redhat.com> In-Reply-To: <1464172174-29237-1-git-send-email-agruenba@redhat.com> References: <1464172174-29237-1-git-send-email-agruenba@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Orangefs has a catch-all xattr handler that effectively does what the trusted handler does already. Signed-off-by: Andreas Gruenbacher --- fs/orangefs/xattr.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/fs/orangefs/xattr.c b/fs/orangefs/xattr.c index 2944d0a..1d8be91 100644 --- a/fs/orangefs/xattr.c +++ b/fs/orangefs/xattr.c @@ -477,41 +477,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 *dentry, - const char *name, - const void *buffer, - size_t size, - int flags) -{ - return orangefs_inode_setxattr(dentry->d_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, @@ -521,7 +486,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 }; -- 2.5.5