From f1ed8fb5c7978f378e22307c7275112b76eb029e Mon Sep 17 00:00:00 2001 From: Shen Feng Date: Fri, 25 Jul 2008 01:46:23 -0700 Subject: [PATCH] --- yaml --- r: 105847 b: refs/heads/master c: ef1afd39519b74fbe1f63c9ab5a14490effec0e3 h: refs/heads/master i: 105845: 442ae0cf7bb1df99ec56044f93e96a600e37a9f2 105843: 15658fe8f96844ad647ca82d31595c8b78648cb6 105839: 6f4f62655f1a7cf3634aa9e1de0acaaad7a6f195 v: v3 --- [refs] | 2 +- trunk/fs/ext3/xattr_security.c | 2 +- trunk/fs/ext3/xattr_trusted.c | 4 +--- trunk/fs/ext3/xattr_user.c | 4 +--- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 3ae0ae5b4bef..cdd92f2cadc1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f31fddfa26b7594b44ff2b34f9a04ba409e0f91 +refs/heads/master: ef1afd39519b74fbe1f63c9ab5a14490effec0e3 diff --git a/trunk/fs/ext3/xattr_security.c b/trunk/fs/ext3/xattr_security.c index 821efaf2b94e..37b81097bdf2 100644 --- a/trunk/fs/ext3/xattr_security.c +++ b/trunk/fs/ext3/xattr_security.c @@ -15,7 +15,7 @@ static size_t ext3_xattr_security_list(struct inode *inode, char *list, size_t list_size, const char *name, size_t name_len) { - const size_t prefix_len = sizeof(XATTR_SECURITY_PREFIX)-1; + const size_t prefix_len = XATTR_SECURITY_PREFIX_LEN; const size_t total_len = prefix_len + name_len + 1; diff --git a/trunk/fs/ext3/xattr_trusted.c b/trunk/fs/ext3/xattr_trusted.c index 0327497a55ce..c7c41a410c4b 100644 --- a/trunk/fs/ext3/xattr_trusted.c +++ b/trunk/fs/ext3/xattr_trusted.c @@ -13,13 +13,11 @@ #include #include "xattr.h" -#define XATTR_TRUSTED_PREFIX "trusted." - static size_t ext3_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/ext3/xattr_user.c b/trunk/fs/ext3/xattr_user.c index 1abd8f92c440..430fe63b31b3 100644 --- a/trunk/fs/ext3/xattr_user.c +++ b/trunk/fs/ext3/xattr_user.c @@ -12,13 +12,11 @@ #include #include "xattr.h" -#define XATTR_USER_PREFIX "user." - static size_t ext3_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))