Browse Source

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>
Shen Feng 17 years ago
parent
commit
f905f06fca
3 changed files with 3 additions and 7 deletions
  1. 1 1
      fs/ext2/xattr_security.c
  2. 1 3
      fs/ext2/xattr_trusted.c
  3. 1 3
      fs/ext2/xattr_user.c

+ 1 - 1
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,
 ext2_xattr_security_list(struct inode *inode, char *list, size_t list_size,
 			 const char *name, size_t name_len)
 			 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;
 	const size_t total_len = prefix_len + name_len + 1;
 
 
 	if (list && total_len <= list_size) {
 	if (list && total_len <= list_size) {

+ 1 - 3
fs/ext2/xattr_trusted.c

@@ -12,13 +12,11 @@
 #include <linux/ext2_fs.h>
 #include <linux/ext2_fs.h>
 #include "xattr.h"
 #include "xattr.h"
 
 
-#define XATTR_TRUSTED_PREFIX "trusted."
-
 static size_t
 static size_t
 ext2_xattr_trusted_list(struct inode *inode, char *list, size_t list_size,
 ext2_xattr_trusted_list(struct inode *inode, char *list, size_t list_size,
 			const char *name, size_t name_len)
 			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;
 	const size_t total_len = prefix_len + name_len + 1;
 
 
 	if (!capable(CAP_SYS_ADMIN))
 	if (!capable(CAP_SYS_ADMIN))

+ 1 - 3
fs/ext2/xattr_user.c

@@ -11,13 +11,11 @@
 #include "ext2.h"
 #include "ext2.h"
 #include "xattr.h"
 #include "xattr.h"
 
 
-#define XATTR_USER_PREFIX "user."
-
 static size_t
 static size_t
 ext2_xattr_user_list(struct inode *inode, char *list, size_t list_size,
 ext2_xattr_user_list(struct inode *inode, char *list, size_t list_size,
 		     const char *name, size_t name_len)
 		     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;
 	const size_t total_len = prefix_len + name_len + 1;
 
 
 	if (!test_opt(inode->i_sb, XATTR_USER))
 	if (!test_opt(inode->i_sb, XATTR_USER))