From 1aa37dfa058a10f53727ed13d677a8ac59359dcf Mon Sep 17 00:00:00 2001 From: Shen Feng Date: Fri, 11 Jul 2008 19:27:31 -0400 Subject: [PATCH] --- yaml --- r: 101077 b: refs/heads/master c: 3537576a707c6df98e883b77b854c6083f844602 h: refs/heads/master i: 101075: 24b9ccaa98b3684a2d0b04c90f356eab98a224b1 v: v3 --- [refs] | 2 +- trunk/fs/ext4/xattr_trusted.c | 4 +--- trunk/fs/ext4/xattr_user.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index fd41207e5e84..504b14370574 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74767c5a2dca0a60676d60d36377a41f60ca42ba +refs/heads/master: 3537576a707c6df98e883b77b854c6083f844602 diff --git a/trunk/fs/ext4/xattr_trusted.c b/trunk/fs/ext4/xattr_trusted.c index fff33382cadc..ac1a52cf2a37 100644 --- a/trunk/fs/ext4/xattr_trusted.c +++ b/trunk/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 --git a/trunk/fs/ext4/xattr_user.c b/trunk/fs/ext4/xattr_user.c index 67be723fcc4e..d91aa61b42aa 100644 --- a/trunk/fs/ext4/xattr_user.c +++ b/trunk/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))