mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
ext3: remove double definitions of xattr macros
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:
parent
3f31fddfa2
commit
ef1afd3951
3 changed files with 3 additions and 7 deletions
|
@ -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;
|
||||
|
||||
|
||||
|
|
|
@ -13,13 +13,11 @@
|
|||
#include <linux/ext3_fs.h>
|
||||
#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))
|
||||
|
|
|
@ -12,13 +12,11 @@
|
|||
#include <linux/ext3_fs.h>
|
||||
#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))
|
||||
|
|
Loading…
Reference in a new issue