The patch titled ext4: remove double definitions of xattr macros has been added to the -mm tree. Its filename is ext4-remove-double-definitions-of-xattr-macros.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: ext4: remove double definitions of xattr macros From: Shen Feng <shen@xxxxxxxxxxxxxx> remove the definitions of macros: XATTR_TRUSTED_PREFIX XATTR_USER_PREFIX since they are defined in linux/xattr.h Signed-off-by: Shen Feng <shen@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ext4/xattr_trusted.c | 4 +--- fs/ext4/xattr_user.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff -puN fs/ext4/xattr_trusted.c~ext4-remove-double-definitions-of-xattr-macros fs/ext4/xattr_trusted.c --- a/fs/ext4/xattr_trusted.c~ext4-remove-double-definitions-of-xattr-macros +++ a/fs/ext4/xattr_trusted.c @@ -13,13 +13,11 @@ #include "ext4.h" #include "xattr.h" -#define XATTR_TRUSTED_PREFIX "trusted." - static size_t ext4_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 -puN fs/ext4/xattr_user.c~ext4-remove-double-definitions-of-xattr-macros fs/ext4/xattr_user.c --- a/fs/ext4/xattr_user.c~ext4-remove-double-definitions-of-xattr-macros +++ a/fs/ext4/xattr_user.c @@ -12,13 +12,11 @@ #include "ext4.h" #include "xattr.h" -#define XATTR_USER_PREFIX "user." - static size_t ext4_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)) _ Patches currently in -mm which might be from shen@xxxxxxxxxxxxxx are linux-next.patch ext3-improve-some-code-in-rb-tree-part-of-dirc.patch ext4-error-proc-entry-creation-when-the-fs-ext4-is-not-correctly-created.patch ext4-improve-some-code-in-rb-tree-part-of-dirc.patch ext4-remove-double-definitions-of-xattr-macros.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html