On Thu, Dec 14, 2023 at 07:34:22AM +0100, Christoph Hellwig wrote:
> xfs_bmap_btalloc_accounting only uses the len field from args, but that
> has just been propagated to ap->length field by the caller.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Yep, nice streamlining...
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> fs/xfs/libxfs/xfs_bmap.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index ca6614f4eac50a..afdfb3455d9ebe 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -3265,8 +3265,7 @@ xfs_bmap_btalloc_select_lengths(
> /* Update all inode and quota accounting for the allocation we just did. */
> static void
> xfs_bmap_btalloc_accounting(
> - struct xfs_bmalloca *ap,
> - struct xfs_alloc_arg *args)
> + struct xfs_bmalloca *ap)
> {
> if (ap->flags & XFS_BMAPI_COWFORK) {
> /*
> @@ -3279,7 +3278,7 @@ xfs_bmap_btalloc_accounting(
> * yet.
> */
> if (ap->wasdel) {
> - xfs_mod_delalloc(ap->ip->i_mount, -(int64_t)args->len);
> + xfs_mod_delalloc(ap->ip->i_mount, -(int64_t)ap->length);
> return;
> }
>
> @@ -3291,22 +3290,22 @@ xfs_bmap_btalloc_accounting(
> * This essentially transfers the transaction quota reservation
> * to that of a delalloc extent.
> */
> - ap->ip->i_delayed_blks += args->len;
> + ap->ip->i_delayed_blks += ap->length;
> xfs_trans_mod_dquot_byino(ap->tp, ap->ip, XFS_TRANS_DQ_RES_BLKS,
> - -(long)args->len);
> + -(long)ap->length);
> return;
> }
>
> /* data/attr fork only */
> - ap->ip->i_nblocks += args->len;
> + ap->ip->i_nblocks += ap->length;
> xfs_trans_log_inode(ap->tp, ap->ip, XFS_ILOG_CORE);
> if (ap->wasdel) {
> - ap->ip->i_delayed_blks -= args->len;
> - xfs_mod_delalloc(ap->ip->i_mount, -(int64_t)args->len);
> + ap->ip->i_delayed_blks -= ap->length;
> + xfs_mod_delalloc(ap->ip->i_mount, -(int64_t)ap->length);
> }
> xfs_trans_mod_dquot_byino(ap->tp, ap->ip,
> ap->wasdel ? XFS_TRANS_DQ_DELBCOUNT : XFS_TRANS_DQ_BCOUNT,
> - args->len);
> + ap->length);
> }
>
> static int
> @@ -3380,7 +3379,7 @@ xfs_bmap_process_allocated_extent(
> ap->offset = orig_offset;
> else if (ap->offset + ap->length < orig_offset + orig_length)
> ap->offset = orig_offset + orig_length - ap->length;
> - xfs_bmap_btalloc_accounting(ap, args);
> + xfs_bmap_btalloc_accounting(ap);
> }
>
> #ifdef DEBUG
> --
> 2.39.2
>
>
