From: Shen Feng remove the definitions of macros: XATTR_SECURITY_PREFIX 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/reiserfs/xattr_security.c | 2 -- fs/reiserfs/xattr_trusted.c | 2 -- fs/reiserfs/xattr_user.c | 2 -- 3 files changed, 6 deletions(-) diff -puN fs/reiserfs/xattr_security.c~reiserfs-remove-double-definitions-of-xattr-macros fs/reiserfs/xattr_security.c --- a/fs/reiserfs/xattr_security.c~reiserfs-remove-double-definitions-of-xattr-macros +++ a/fs/reiserfs/xattr_security.c @@ -6,8 +6,6 @@ #include #include -#define XATTR_SECURITY_PREFIX "security." - static int security_get(struct inode *inode, const char *name, void *buffer, size_t size) { diff -puN fs/reiserfs/xattr_trusted.c~reiserfs-remove-double-definitions-of-xattr-macros fs/reiserfs/xattr_trusted.c --- a/fs/reiserfs/xattr_trusted.c~reiserfs-remove-double-definitions-of-xattr-macros +++ a/fs/reiserfs/xattr_trusted.c @@ -7,8 +7,6 @@ #include #include -#define XATTR_TRUSTED_PREFIX "trusted." - static int trusted_get(struct inode *inode, const char *name, void *buffer, size_t size) { diff -puN fs/reiserfs/xattr_user.c~reiserfs-remove-double-definitions-of-xattr-macros fs/reiserfs/xattr_user.c --- a/fs/reiserfs/xattr_user.c~reiserfs-remove-double-definitions-of-xattr-macros +++ a/fs/reiserfs/xattr_user.c @@ -10,8 +10,6 @@ # include #endif -#define XATTR_USER_PREFIX "user." - static int user_get(struct inode *inode, const char *name, void *buffer, size_t size) { _