Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f905f06fca5d3949eca12f5a43e251a404b3470a

Authored by Shen Feng
Committed by Linus Torvalds
1 parent fb523f3227

ext2: remove double definitions of xattr macros 

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@cn.fujitsu.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 3 changed files with 3 additions and 7 deletions Side-by-side Diff

fs/ext2/xattr_security.c
Diff comments   View file @ f905f06
... ... @@ -14,7 +14,7 @@
14 14 ext2_xattr_security_list(struct inode *inode, char *list, size_t list_size,
15 15 const char *name, size_t name_len)
16 16 {
17   - const int prefix_len = sizeof(XATTR_SECURITY_PREFIX)-1;
  17 + const int prefix_len = XATTR_SECURITY_PREFIX_LEN;
18 18 const size_t total_len = prefix_len + name_len + 1;
19 19  
20 20 if (list && total_len <= list_size) {
fs/ext2/xattr_trusted.c
Diff comments   View file @ f905f06
... ... @@ -12,13 +12,11 @@
12 12 #include <linux/ext2_fs.h>
13 13 #include "xattr.h"
14 14  
15   -#define XATTR_TRUSTED_PREFIX "trusted."
16   -
17 15 static size_t
18 16 ext2_xattr_trusted_list(struct inode *inode, char *list, size_t list_size,
19 17 const char *name, size_t name_len)
20 18 {
21   - const int prefix_len = sizeof(XATTR_TRUSTED_PREFIX)-1;
  19 + const int prefix_len = XATTR_TRUSTED_PREFIX_LEN;
22 20 const size_t total_len = prefix_len + name_len + 1;
23 21  
24 22 if (!capable(CAP_SYS_ADMIN))
fs/ext2/xattr_user.c
Diff comments   View file @ f905f06
... ... @@ -11,13 +11,11 @@
11 11 #include "ext2.h"
12 12 #include "xattr.h"
13 13  
14   -#define XATTR_USER_PREFIX "user."
15   -
16 14 static size_t
17 15 ext2_xattr_user_list(struct inode *inode, char *list, size_t list_size,
18 16 const char *name, size_t name_len)
19 17 {
20   - const size_t prefix_len = sizeof(XATTR_USER_PREFIX)-1;
  18 + const size_t prefix_len = XATTR_USER_PREFIX_LEN;
21 19 const size_t total_len = prefix_len + name_len + 1;
22 20  
23 21 if (!test_opt(inode->i_sb, XATTR_USER))