mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
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: Shen Feng <shen@cn.fujitsu.com> Signed-off-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
parent
74767c5a2d
commit
3537576a70
2 changed files with 2 additions and 6 deletions
|
@ -13,13 +13,11 @@
|
||||||
#include "ext4.h"
|
#include "ext4.h"
|
||||||
#include "xattr.h"
|
#include "xattr.h"
|
||||||
|
|
||||||
#define XATTR_TRUSTED_PREFIX "trusted."
|
|
||||||
|
|
||||||
static size_t
|
static size_t
|
||||||
ext4_xattr_trusted_list(struct inode *inode, char *list, size_t list_size,
|
ext4_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 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;
|
const size_t total_len = prefix_len + name_len + 1;
|
||||||
|
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
if (!capable(CAP_SYS_ADMIN))
|
||||||
|
|
|
@ -12,13 +12,11 @@
|
||||||
#include "ext4.h"
|
#include "ext4.h"
|
||||||
#include "xattr.h"
|
#include "xattr.h"
|
||||||
|
|
||||||
#define XATTR_USER_PREFIX "user."
|
|
||||||
|
|
||||||
static size_t
|
static size_t
|
||||||
ext4_xattr_user_list(struct inode *inode, char *list, size_t list_size,
|
ext4_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))
|
||||||
|
|
Loading…
Reference in a new issue