1 From: Tiger Yang <tiger.yang@oracle.com>
2 Date: Thu, 23 Oct 2008 16:34:13 +0800
3 Subject: ocfs2: remove duplicate definition in xattr
5 Include/linux/xattr.h already has the definition about xattr prefix,
6 so remove the duplicate definitions in xattr.c.
8 Signed-off-by: Tiger Yang <tiger.yang@oracle.com>
9 Signed-off-by: Joel Becker <joel.becker@oracle.com>
10 Signed-off-by: Mark Fasheh <mfasheh@suse.com>
12 fs/ocfs2/xattr.c | 11 ++---------
13 1 files changed, 2 insertions(+), 9 deletions(-)
15 Index: linux-2.6.27-ocfs2/fs/ocfs2/xattr.c
16 ===================================================================
17 --- linux-2.6.27-ocfs2.orig/fs/ocfs2/xattr.c
18 +++ linux-2.6.27-ocfs2/fs/ocfs2/xattr.c
19 @@ -4740,14 +4740,11 @@ out:
21 * 'trusted' attributes support
24 -#define XATTR_TRUSTED_PREFIX "trusted."
26 static size_t ocfs2_xattr_trusted_list(struct inode *inode, char *list,
27 size_t list_size, const char *name,
30 - const size_t prefix_len = sizeof(XATTR_TRUSTED_PREFIX) - 1;
31 + const size_t prefix_len = XATTR_TRUSTED_PREFIX_LEN;
32 const size_t total_len = prefix_len + name_len + 1;
34 if (list && total_len <= list_size) {
35 @@ -4784,18 +4781,14 @@ struct xattr_handler ocfs2_xattr_trusted
36 .set = ocfs2_xattr_trusted_set,
41 * 'user' attributes support
44 -#define XATTR_USER_PREFIX "user."
46 static size_t ocfs2_xattr_user_list(struct inode *inode, char *list,
47 size_t list_size, const char *name,
50 - const size_t prefix_len = sizeof(XATTR_USER_PREFIX) - 1;
51 + const size_t prefix_len = XATTR_USER_PREFIX_LEN;
52 const size_t total_len = prefix_len + name_len + 1;
53 struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);