xfs
[Top] [All Lists]

Re: [PATCH 5/5] xfs: pass struct da_args to xfs_attr_calc_size

To: Christoph Hellwig <hch@xxxxxx>
Subject: Re: [PATCH 5/5] xfs: pass struct da_args to xfs_attr_calc_size
From: Brian Foster <bfoster@xxxxxxxxxx>
Date: Mon, 5 May 2014 16:21:50 -0400
Cc: xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1399130415-5382-6-git-send-email-hch@xxxxxx>
References: <1399130415-5382-1-git-send-email-hch@xxxxxx> <1399130415-5382-6-git-send-email-hch@xxxxxx>
User-agent: Mutt/1.5.21 (2010-09-15)
On Sat, May 03, 2014 at 05:20:15PM +0200, Christoph Hellwig wrote:
> And remove a very confused comment.
> 
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---

Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>

>  fs/xfs/xfs_attr.c |   14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
> 
> diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
> index 1208621..86f482e 100644
> --- a/fs/xfs/xfs_attr.c
> +++ b/fs/xfs/xfs_attr.c
> @@ -162,12 +162,10 @@ xfs_attr_get(
>   */
>  STATIC int
>  xfs_attr_calc_size(
> -     struct xfs_inode        *ip,
> -     int                     namelen,
> -     int                     valuelen,
> +     struct xfs_da_args      *args,
>       int                     *local)
>  {
> -     struct xfs_mount        *mp = ip->i_mount;
> +     struct xfs_mount        *mp = args->dp->i_mount;
>       int                     size;
>       int                     nblks;
>  
> @@ -175,7 +173,7 @@ xfs_attr_calc_size(
>        * Determine space new attribute will use, and if it would be
>        * "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);
>  
>       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
>                * 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 += XFS_NEXTENTADD_SPACE_RES(mp, dblocks, XFS_ATTR_FORK);
>       }
> @@ -227,9 +225,7 @@ xfs_attr_set(
>       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);
> +     args.total = xfs_attr_calc_size(&args, &local);
>  
>       error = xfs_qm_dqattach(dp, 0);
>       if (error)
> -- 
> 1.7.10.4
> 
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs

<Prev in Thread] Current Thread [Next in Thread>