diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:26:19 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:26:19 +0200 |
commit | 88bef5a4074e0568cf54df410f41065c06694d8a (patch) | |
tree | bc4d59f57ce315bcb16dad5491ab9983ab122d8a /fs/ext2/xattr_trusted.c | |
parent | flag parameters: fix compile error of sys_epoll_create1 (diff) | |
parent | x86_64: fix ia32 AMD syscall audit fast-path (diff) | |
download | linux-88bef5a4074e0568cf54df410f41065c06694d8a.tar.xz linux-88bef5a4074e0568cf54df410f41065c06694d8a.zip |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'fs/ext2/xattr_trusted.c')
-rw-r--r-- | fs/ext2/xattr_trusted.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ext2/xattr_trusted.c b/fs/ext2/xattr_trusted.c index 83ee149f353d..e8219f8eae9f 100644 --- a/fs/ext2/xattr_trusted.c +++ b/fs/ext2/xattr_trusted.c @@ -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)) |