xfs: remove the xfs_alloc_arg argument to xfs_bmap_btalloc_accounting

Source kernel commit: eef519d746bbfb90cbad4077c2d39d7a359c3282

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@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
Reviewed-by: Bill O'Donnell <bodonnel@redhat.com>

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 3520235b58afbd76254fabfe17c0d0486c2fdf36..ad058bb126e25f9b1c15c2fa422359c90ef769fb 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -3259,8 +3259,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) {
                /*
@@ -3273,7 +3272,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;
                }
 
@@ -3285,22 +3284,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
@@ -3374,7 +3373,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