forked from Minki/linux
ocfs2: remove duplicate definition in xattr
Include/linux/xattr.h already has the definition about xattr prefix, so remove the duplicate definitions in xattr.c. Signed-off-by: Tiger Yang <tiger.yang@oracle.com> Signed-off-by: Joel Becker <joel.becker@oracle.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
parent
0030e00150
commit
ceb1eba3dc
@ -4740,14 +4740,11 @@ out:
|
|||||||
/*
|
/*
|
||||||
* 'trusted' attributes support
|
* 'trusted' attributes support
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define XATTR_TRUSTED_PREFIX "trusted."
|
|
||||||
|
|
||||||
static size_t ocfs2_xattr_trusted_list(struct inode *inode, char *list,
|
static size_t ocfs2_xattr_trusted_list(struct inode *inode, char *list,
|
||||||
size_t list_size, const char *name,
|
size_t list_size, const char *name,
|
||||||
size_t name_len)
|
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 (list && total_len <= list_size) {
|
if (list && total_len <= list_size) {
|
||||||
@ -4784,18 +4781,14 @@ struct xattr_handler ocfs2_xattr_trusted_handler = {
|
|||||||
.set = ocfs2_xattr_trusted_set,
|
.set = ocfs2_xattr_trusted_set,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 'user' attributes support
|
* 'user' attributes support
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define XATTR_USER_PREFIX "user."
|
|
||||||
|
|
||||||
static size_t ocfs2_xattr_user_list(struct inode *inode, char *list,
|
static size_t ocfs2_xattr_user_list(struct inode *inode, char *list,
|
||||||
size_t list_size, const char *name,
|
size_t list_size, const char *name,
|
||||||
size_t name_len)
|
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;
|
||||||
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
|
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user