xfs: remove the nr_extents argument to xfs_iext_remove

Source kernel commit: c38ccf599022e7454a861145ce1a94c5b5d7e658

We only have two places that remove 2 extents at the same time, so unroll
the loop there.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index dba284d98da0b1669264e0712321dc225a5b2f76..d8e6e7c4ec5e071bad3c4b83ad5749ade03be4af 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -1636,7 +1636,8 @@ xfs_bmap_add_extent_delay_real(
                 */
                LEFT.br_blockcount += PREV.br_blockcount + RIGHT.br_blockcount;
 
-               xfs_iext_remove(bma->ip, &bma->icur, 2, state);
+               xfs_iext_remove(bma->ip, &bma->icur, state);
+               xfs_iext_remove(bma->ip, &bma->icur, state);
                xfs_iext_prev(ifp, &bma->icur);
                xfs_iext_update_extent(bma->ip, state, &bma->icur, &LEFT);
                (*nextents)--;
@@ -1671,7 +1672,7 @@ xfs_bmap_add_extent_delay_real(
                old = LEFT;
                LEFT.br_blockcount += PREV.br_blockcount;
 
-               xfs_iext_remove(bma->ip, &bma->icur, 1, state);
+               xfs_iext_remove(bma->ip, &bma->icur, state);
                xfs_iext_prev(ifp, &bma->icur);
                xfs_iext_update_extent(bma->ip, state, &bma->icur, &LEFT);
 
@@ -1698,7 +1699,7 @@ xfs_bmap_add_extent_delay_real(
                PREV.br_blockcount += RIGHT.br_blockcount;
 
                xfs_iext_next(ifp, &bma->icur);
-               xfs_iext_remove(bma->ip, &bma->icur, 1, state);
+               xfs_iext_remove(bma->ip, &bma->icur, state);
                xfs_iext_prev(ifp, &bma->icur);
                xfs_iext_update_extent(bma->ip, state, &bma->icur, &PREV);
 
@@ -2135,7 +2136,8 @@ xfs_bmap_add_extent_unwritten_real(
                 */
                LEFT.br_blockcount += PREV.br_blockcount + RIGHT.br_blockcount;
 
-               xfs_iext_remove(ip, icur, 2, state);
+               xfs_iext_remove(ip, icur, state);
+               xfs_iext_remove(ip, icur, state);
                xfs_iext_prev(ifp, icur);
                xfs_iext_update_extent(ip, state, icur, &LEFT);
                XFS_IFORK_NEXT_SET(ip, whichfork,
@@ -2173,7 +2175,7 @@ xfs_bmap_add_extent_unwritten_real(
                 */
                LEFT.br_blockcount += PREV.br_blockcount;
 
-               xfs_iext_remove(ip, icur, 1, state);
+               xfs_iext_remove(ip, icur, state);
                xfs_iext_prev(ifp, icur);
                xfs_iext_update_extent(ip, state, icur, &LEFT);
                XFS_IFORK_NEXT_SET(ip, whichfork,
@@ -2207,7 +2209,7 @@ xfs_bmap_add_extent_unwritten_real(
                PREV.br_state = new->br_state;
 
                xfs_iext_next(ifp, icur);
-               xfs_iext_remove(ip, icur, 1, state);
+               xfs_iext_remove(ip, icur, state);
                xfs_iext_prev(ifp, icur);
                xfs_iext_update_extent(ip, state, icur, &PREV);
 
@@ -2574,7 +2576,7 @@ xfs_bmap_add_extent_hole_delay(
                left.br_startblock = nullstartblock(newlen);
                left.br_blockcount = temp;
 
-               xfs_iext_remove(ip, icur, 1, state);
+               xfs_iext_remove(ip, icur, state);
                xfs_iext_prev(ifp, icur);
                xfs_iext_update_extent(ip, state, icur, &left);
                break;
@@ -2719,7 +2721,7 @@ xfs_bmap_add_extent_hole_real(
                 */
                left.br_blockcount += new->br_blockcount + right.br_blockcount;
 
-               xfs_iext_remove(ip, icur, 1, state);
+               xfs_iext_remove(ip, icur, state);
                xfs_iext_prev(ifp, icur);
                xfs_iext_update_extent(ip, state, icur, &left);
 
@@ -4677,7 +4679,7 @@ xfs_bmap_del_extent_delay(
                /*
                 * Matches the whole extent.  Delete the entry.
                 */
-               xfs_iext_remove(ip, icur, 1, state);
+               xfs_iext_remove(ip, icur, state);
                xfs_iext_prev(ifp, icur);
                break;
        case BMAP_LEFT_FILLING:
@@ -4778,7 +4780,7 @@ xfs_bmap_del_extent_cow(
                /*
                 * Matches the whole extent.  Delete the entry.
                 */
-               xfs_iext_remove(ip, icur, 1, state);
+               xfs_iext_remove(ip, icur, state);
                xfs_iext_prev(ifp, icur);
                break;
        case BMAP_LEFT_FILLING:
@@ -4918,7 +4920,7 @@ xfs_bmap_del_extent_real(
                /*
                 * Matches the whole extent.  Delete the entry.
                 */
-               xfs_iext_remove(ip, icur, 1, state);
+               xfs_iext_remove(ip, icur, state);
                xfs_iext_prev(ifp, icur);
                XFS_IFORK_NEXT_SET(ip, whichfork,
                        XFS_IFORK_NEXTENTS(ip, whichfork) - 1);
@@ -5544,7 +5546,7 @@ xfs_bmse_merge(
                return error;
 
 done:
-       xfs_iext_remove(ip, icur, 1, 0);
+       xfs_iext_remove(ip, icur, 0);
        xfs_iext_prev(XFS_IFORK_PTR(ip, whichfork), icur);
        xfs_iext_update_extent(ip, xfs_bmap_fork_to_state(whichfork), icur,
                        &new);

diff --git a/libxfs/xfs_iext_tree.c b/libxfs/xfs_iext_tree.c
index 5be9bff04cad123c4b502915024f259063ff9a81..395cbfe1d6c33d9b3bb459051557f0a5c3f1bfb9 100644 (file)
--- a/libxfs/xfs_iext_tree.c
+++ b/libxfs/xfs_iext_tree.c
@@ -818,15 +818,19 @@ xfs_iext_free_last_leaf(
        kmem_free(ifp->if_u1.if_root);
 }
 
-static void
-__xfs_iext_remove(
-       struct xfs_ifork        *ifp,
-       struct xfs_iext_cursor  *cur)
+void
+xfs_iext_remove(
+       struct xfs_inode        *ip,
+       struct xfs_iext_cursor  *cur,
+       int                     state)
 {
+       struct xfs_ifork        *ifp = xfs_iext_state_to_fork(ip, state);
        struct xfs_iext_leaf    *leaf = cur->leaf;
        xfs_fileoff_t           offset = xfs_iext_leaf_key(leaf, 0);
        int                     i, nr_entries;
 
+       trace_xfs_iext_remove(ip, cur, state, _RET_IP_);
+
        ASSERT(ifp->if_height > 0);
        ASSERT(ifp->if_u1.if_root != NULL);
        ASSERT(xfs_iext_valid(ifp, cur));
@@ -858,24 +862,6 @@ __xfs_iext_remove(
                xfs_iext_free_last_leaf(ifp);
 }
 
-void
-xfs_iext_remove(
-       struct xfs_inode        *ip,
-       struct xfs_iext_cursor  *cur,
-       int                     nr_extents,
-       int                     state)
-{
-       struct xfs_ifork        *ifp = xfs_iext_state_to_fork(ip, state);
-       int                     i;
-
-       ASSERT(nr_extents > 0);
-
-       for (i = 0; i < nr_extents; i++) {
-               trace_xfs_iext_remove(ip, cur, state, _RET_IP_);
-               __xfs_iext_remove(ifp, cur);
-       }
-}
-
 /*
  * Lookup the extent covering bno.
  *

diff --git a/libxfs/xfs_inode_fork.h b/libxfs/xfs_inode_fork.h
index 84b5e6f8bf2c3ca76c35bff0539df8db3a1d6372..b9f0098e33b826cd51bc6ce15801c8f4f755703d 100644 (file)
--- a/libxfs/xfs_inode_fork.h
+++ b/libxfs/xfs_inode_fork.h
@@ -116,7 +116,7 @@ xfs_extnum_t        xfs_iext_count(struct xfs_ifork *ifp);
 void           xfs_iext_insert(struct xfs_inode *, struct xfs_iext_cursor *cur,
                        struct xfs_bmbt_irec *, int);
 void           xfs_iext_remove(struct xfs_inode *, struct xfs_iext_cursor *,
-                       int, int);
+                       int);
 void           xfs_iext_destroy(struct xfs_ifork *);
 
 bool           xfs_iext_lookup_extent(struct xfs_inode *ip,