From: Shen Feng Subject: [PATCH 3/3] ext3: remove double definitions of xattr macros Date: Thu, 29 May 2008 10:11:45 +0800 Message-ID: <483E10E1.2020307@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit To: linux-ext4@vger.kernel.org, cmm@us.ibm.com, Andrew Morton Return-path: Received: from cn.fujitsu.com ([222.73.24.84]:56272 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1750714AbYE2COV (ORCPT ); Wed, 28 May 2008 22:14:21 -0400 Sender: linux-ext4-owner@vger.kernel.org List-ID: remove the definitions of macros: XATTR_TRUSTED_PREFIX XATTR_USER_PREFIX since they are defined in linux/xattr.h Signed-off-by: Shen Feng Signed-off-by: Mingming Cao --- fs/ext3/xattr_security.c | 2 +- fs/ext3/xattr_trusted.c | 4 +--- fs/ext3/xattr_user.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/fs/ext3/xattr_security.c b/fs/ext3/xattr_security.c index 821efaf..37b8109 100644 --- a/fs/ext3/xattr_security.c +++ b/fs/ext3/xattr_security.c @@ -15,7 +15,7 @@ static size_t ext3_xattr_security_list(struct inode *inode, 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 prefix_len = XATTR_SECURITY_PREFIX_LEN; const size_t total_len = prefix_len + name_len + 1; diff --git a/fs/ext3/xattr_trusted.c b/fs/ext3/xattr_trusted.c index 0327497..c7c41a4 100644 --- a/fs/ext3/xattr_trusted.c +++ b/fs/ext3/xattr_trusted.c @@ -13,13 +13,11 @@ #include #include "xattr.h" -#define XATTR_TRUSTED_PREFIX "trusted." - static size_t ext3_xattr_trusted_list(struct inode *inode, char *list, size_t list_size, const char *name, size_t name_len) { - const size_t prefix_len = sizeof(XATTR_TRUSTED_PREFIX)-1; + const size_t prefix_len = XATTR_TRUSTED_PREFIX_LEN; const size_t total_len = prefix_len + name_len + 1; if (!capable(CAP_SYS_ADMIN)) diff --git a/fs/ext3/xattr_user.c b/fs/ext3/xattr_user.c index 1abd8f9..430fe63 100644 --- a/fs/ext3/xattr_user.c +++ b/fs/ext3/xattr_user.c @@ -12,13 +12,11 @@ #include #include "xattr.h" -#define XATTR_USER_PREFIX "user."