Skip to contentSkip to conversation

ext2: remove double definitions of xattr macros

PATCH New Shen Feng 1 participant 1 message May 29, 2008 ext2 file system

lore
Share & tools
lore

Shen Feng

author
#0 lore raw

PATCH 2/3 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 <[email protected]>
Signed-off-by Mingming Cao <[email protected]>
---
 fs/ext2/xattr_security.c |    2 +-
 fs/ext2/xattr_trusted.c  |    4 +---
 fs/ext2/xattr_user.c     |    4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)
fs/ext2/xattr_security.c +1 -1
index eaa23d2..70c0dbd 100644
@@ -14,7 +14,7 @@ static size_t
 ext2_xattr_security_list(struct inode *inode, char *list, size_t list_size,
 			 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;
 
 	if (list && total_len <= list_size) {
fs/ext2/xattr_trusted.c +1 -3
index 83ee149..e8219f8 100644
@@ -12,13 +12,11 @@
 #include <linux/ext2_fs.h>
 #include "xattr.h"
 
-#define XATTR_TRUSTED_PREFIX "trusted."
-
 static size_t
 ext2_xattr_trusted_list(struct inode *inode, char *list, size_t list_size,
 			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;
 
 	if (!capable(CAP_SYS_ADMIN))
fs/ext2/xattr_user.c +0 -1
index f383e7c..92495d2 100644
@@ -11,13 +11,11 @@
 #include "ext2.h"
 #include "xattr.h"
 
-#define XATTR_USER_PREFIX "user."