Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-02 17:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfs: simplify attr name setup

Browse Source 
Replace xfs_attr_name_to_xname with a new xfs_attr_args_init helper that
sets up the basic da_args structure without using a temporary xfs_name
structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Christoph Hellwig 2014-05-13 16:34:43 +10:00 committed by Dave Chinner
parent 1bc426a76b
commit 67fd718f30
1 changed files with 29 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
fs/xfs/xfs_attr.c
View File

@ -77,17 +77,26 @@ STATIC int xfs_attr_refillstate(xfs_da_state_t *state);
STATIC int
xfs_attr_name_to_xname(
struct xfs_name *xname,
const unsigned char *aname)
xfs_attr_args_init(
struct xfs_da_args *args,
struct xfs_inode *dp,
const unsigned char *name,
int flags)
{
if (!aname)
if (!name)
return EINVAL;
xname->name = aname;
xname->len = strlen((char *)aname);
if (xname->len >= MAXNAMELEN)
memset(args, 0, sizeof(*args));
args->whichfork = XFS_ATTR_FORK;
args->dp = dp;
args->flags = flags;
args->name = name;
args->namelen = strlen((const char *)name);
if (args->namelen >= MAXNAMELEN)
return EFAULT; /* match IRIX behaviour */
args->hashval = xfs_da_hashname(args->name, args->namelen);
return 0;
}
@ -115,7 +124,6 @@ xfs_attr_get(
int flags)
{
struct xfs_da_args args;
struct xfs_name xname;
uint lock_mode;
int error;
@ -127,19 +135,12 @@ xfs_attr_get(
if (!xfs_inode_hasattr(ip))
return ENOATTR;
error = xfs_attr_name_to_xname(&xname, name);
error = xfs_attr_args_init(&args, ip, name, flags);
if (error)
return error;
memset(&args, 0, sizeof(args));
args.name = xname.name;
args.namelen = xname.len;
args.value = value;
args.valuelen = *valuelenp;
args.flags = flags;
args.hashval = xfs_da_hashname(args.name, args.namelen);
args.dp = ip;
args.whichfork = XFS_ATTR_FORK;
lock_mode = xfs_ilock_attr_map_shared(ip);
if (!xfs_inode_hasattr(ip))
@ -208,7 +209,6 @@ xfs_attr_set(
struct xfs_da_args args;
struct xfs_bmap_free flist;
struct xfs_trans_res tres;
struct xfs_name xname;
xfs_fsblock_t firstblock;
int rsvd = (flags & ATTR_ROOT) != 0;
int error, err2, committed, local;
@ -218,10 +218,19 @@ xfs_attr_set(
if (XFS_FORCED_SHUTDOWN(dp->i_mount))
return EIO;
error = xfs_attr_name_to_xname(&xname, name);
error = xfs_attr_args_init(&args, dp, name, flags);
if (error)
return error;
args.value = value;
args.valuelen = valuelen;
args.firstblock = &firstblock;
args.flist = &flist;
args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT;
/* Size is now blocks for attribute data */
args.total = xfs_attr_calc_size(dp, args.namelen, valuelen, &local);
error = xfs_qm_dqattach(dp, 0);
if (error)
return error;
@ -232,29 +241,13 @@ xfs_attr_set(
*/
if (XFS_IFORK_Q(dp) == 0) {
int sf_size = sizeof(xfs_attr_sf_hdr_t) +
XFS_ATTR_SF_ENTSIZE_BYNAME(xname.len, valuelen);
XFS_ATTR_SF_ENTSIZE_BYNAME(args.namelen, valuelen);
error = xfs_bmap_add_attrfork(dp, sf_size, rsvd);
if (error)
return error;
}
memset(&args, 0, sizeof(args));
args.name = xname.name;
args.namelen = xname.len;
args.value = value;
args.valuelen = valuelen;
args.flags = flags;
args.hashval = xfs_da_hashname(args.name, args.namelen);
args.dp = dp;
args.firstblock = &firstblock;
args.flist = &flist;
args.whichfork = XFS_ATTR_FORK;
args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT;
/* Size is now blocks for attribute data */
args.total = xfs_attr_calc_size(dp, xname.len, valuelen, &local);
/*
* Start our first transaction of the day.
*
@ -425,7 +418,6 @@ xfs_attr_remove(
struct xfs_mount *mp = dp->i_mount;
struct xfs_da_args args;
struct xfs_bmap_free flist;
struct xfs_name xname;
xfs_fsblock_t firstblock;
int error;
@ -437,20 +429,12 @@ xfs_attr_remove(
if (!xfs_inode_hasattr(dp))
return ENOATTR;
error = xfs_attr_name_to_xname(&xname, name);
error = xfs_attr_args_init(&args, dp, name, flags);
if (error)
return error;
memset(&args, 0, sizeof(args));
args.name = xname.name;
args.namelen = xname.len;
args.flags = flags;
args.hashval = xfs_da_hashname(args.name, args.namelen);
args.dp = dp;
args.firstblock = &firstblock;
args.flist = &flist;
args.total = 0;
args.whichfork = XFS_ATTR_FORK;
/*
* we have no control over the attribute names that userspace passes us