Skip to content

Commit

Permalink
ext4: remove double definitions of xattr macros
Browse files Browse the repository at this point in the history
remove the definitions of macros XATTR_TRUSTED_PREFIX and 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: "Theodore Ts'o" <tytso@mit.edu>
  • Loading branch information
Shen Feng authored and Theodore Ts'o committed Jul 11, 2008
1 parent 74767c5 commit 3537576
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 1 addition & 3 deletions fs/ext4/xattr_trusted.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 1 addition & 3 deletions fs/ext4/xattr_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 3537576

Please sign in to comment.