Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3537576a authored by Shen Feng's avatar Shen Feng Committed by Theodore Ts'o
Browse files

ext4: remove double definitions of xattr macros 



remove the definitions of macros XATTR_TRUSTED_PREFIX and XATTR_USER_PREFIX
since they are defined in linux/xattr.h

Signed-off-by: default avatarShen Feng <shen@cn.fujitsu.com>
Signed-off-by: default avatarMingming Cao <cmm@us.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 74767c5a

fs/ext4/xattr_trusted.c

+1 −3
Original line number Diff line number Diff line
@@ -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))

fs/ext4/xattr_user.c

+1 −3
Original line number Diff line number Diff line
@@ -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))