lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ext2: remove double definitions of xattr macros

Browse Source 
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>
This commit is contained in:
Shen Feng
2008-07-25 01:46:15 -07:00
committed by Linus Torvalds
parent fb523f3227
commit f905f06fca
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ext2/xattr_security.c
View File

@@ -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) {

4
fs/ext2/xattr_trusted.c
View File

@@ -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))

4
fs/ext2/xattr_user.c
View File

@@ -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))