evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xfs: pass struct da_args to xfs_attr_calc_size

Browse source 
And remove a very confused comment.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Christoph Hellwig 2014-05-13 16:40:19 +10:00 • committed by Dave Chinner
parent 67fd718f30
commit 6c888af0b4
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fs/xfs/xfs_attr.c
View file

@ -162,12 +162,10 @@ xfs_attr_get(
*/ */
STATIC int STATIC int
xfs_attr_calc_size( xfs_attr_calc_size(
struct xfs_inode *ip, struct xfs_da_args *args,
int namelen,
int valuelen,
int *local) int *local)
{ {
struct xfs_mount *mp = ip->i_mount; struct xfs_mount *mp = args->dp->i_mount;
int size; int size;
int nblks; int nblks;
@ -175,7 +173,7 @@ xfs_attr_calc_size(
* Determine space new attribute will use, and if it would be * Determine space new attribute will use, and if it would be
* "local" or "remote" (note: local != inline). * "local" or "remote" (note: local != inline).
*/ */
size = xfs_attr_leaf_newentsize(namelen, valuelen, size = xfs_attr_leaf_newentsize(args->namelen, args->valuelen,
mp->m_sb.sb_blocksize, local); mp->m_sb.sb_blocksize, local);
nblks = XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK); nblks = XFS_DAENTER_SPACE_RES(mp, XFS_ATTR_FORK);
@ -189,7 +187,7 @@ xfs_attr_calc_size(
* Out of line attribute, cannot double split, but * Out of line attribute, cannot double split, but
* make room for the attribute value itself. * make room for the attribute value itself.
*/ */
uint dblocks = XFS_B_TO_FSB(mp, valuelen); uint dblocks = XFS_B_TO_FSB(mp, args->valuelen);
nblks += dblocks; nblks += dblocks;
nblks += XFS_NEXTENTADD_SPACE_RES(mp, dblocks, XFS_ATTR_FORK); nblks += XFS_NEXTENTADD_SPACE_RES(mp, dblocks, XFS_ATTR_FORK);
} }
@ -227,9 +225,7 @@ xfs_attr_set(
args.firstblock = &firstblock; args.firstblock = &firstblock;
args.flist = &flist; args.flist = &flist;
args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT; args.op_flags = XFS_DA_OP_ADDNAME | XFS_DA_OP_OKNOENT;
args.total = xfs_attr_calc_size(&args, &local);
/* Size is now blocks for attribute data */
args.total = xfs_attr_calc_size(dp, args.namelen, valuelen, &local);
error = xfs_qm_dqattach(dp, 0); error = xfs_qm_dqattach(dp, 0);
if (error) if (error)