From: Shen Feng 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 Signed-off-by: Andrew Morton --- fs/ext2/xattr_security.c | 2 +- fs/ext2/xattr_trusted.c | 4 +--- fs/ext2/xattr_user.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff -puN fs/ext2/xattr_security.c~ext2-remove-double-definitions-of-xattr-macros fs/ext2/xattr_security.c --- a/fs/ext2/xattr_security.c~ext2-remove-double-definitions-of-xattr-macros +++ a/fs/ext2/xattr_security.c @@ -14,7 +14,7 @@ static size_t ext2_xattr_security_list(struct inode *inode, char *list, size_t list_size, const char *name, size_t name_len) { - const int prefix_len = sizeof(XATTR_SECURITY_PREFIX)-1; + const int prefix_len = XATTR_SECURITY_PREFIX_LEN; const size_t total_len = prefix_len + name_len + 1; if (list && total_len <= list_size) { diff -puN fs/ext2/xattr_trusted.c~ext2-remove-double-definitions-of-xattr-macros fs/ext2/xattr_trusted.c --- a/fs/ext2/xattr_trusted.c~ext2-remove-double-definitions-of-xattr-macros +++ a/fs/ext2/xattr_trusted.c @@ -12,13 +12,11 @@ #include #include "xattr.h" -#define XATTR_TRUSTED_PREFIX "trusted." - static size_t ext2_xattr_trusted_list(struct inode *inode, char *list, size_t list_size, const char *name, size_t name_len) { - const int prefix_len = sizeof(XATTR_TRUSTED_PREFIX)-1; + const int prefix_len = XATTR_TRUSTED_PREFIX_LEN; const size_t total_len = prefix_len + name_len + 1; if (!capable(CAP_SYS_ADMIN)) diff -puN fs/ext2/xattr_user.c~ext2-remove-double-definitions-of-xattr-macros fs/ext2/xattr_user.c --- a/fs/ext2/xattr_user.c~ext2-remove-double-definitions-of-xattr-macros +++ a/fs/ext2/xattr_user.c @@ -11,13 +11,11 @@ #include "ext2.h" #include "xattr.h" -#define XATTR_USER_PREFIX "user." - static size_t ext2_xattr_user_list(struct inode *inode, char *list, size_t list_size, const char *name, size_t name_len) { - const size_t prefix_len = sizeof(XATTR_USER_PREFIX)-1; + const size_t prefix_len = XATTR_USER_PREFIX_LEN; const size_t total_len = prefix_len + name_len + 1; if (!test_opt(inode->i_sb, XATTR_USER)) _