From: Christoph Hellwig Date: Fri, 17 Nov 2017 04:11:35 +0000 (-0600) Subject: xfs: remove the nr_extents argument to xfs_iext_insert X-Git-Tag: v4.15.0-rc1~143^2~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26a75f6700cdd52975ce1aa37176448e2632e262;p=thirdparty%2Fxfsprogs-dev.git xfs: remove the nr_extents argument to xfs_iext_insert Source kernel commit: 0254c2f253d6fe11ea2ce5046ed6acfddbe4ee17 We only have two places that insert 2 extents at the same time, so unroll the loop there. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong Signed-off-by: Darrick J. Wong Signed-off-by: Eric Sandeen --- diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c index ff148a16d..dba284d98 100644 --- a/libxfs/xfs_bmap.c +++ b/libxfs/xfs_bmap.c @@ -892,7 +892,7 @@ xfs_bmap_local_to_extents( rec.br_blockcount = 1; rec.br_state = XFS_EXT_NORM; xfs_iext_first(ifp, &icur); - xfs_iext_insert(ip, &icur, 1, &rec, 0); + xfs_iext_insert(ip, &icur, &rec, 0); XFS_IFORK_NEXT_SET(ip, whichfork, 1); ip->i_d.di_nblocks = 1; @@ -1259,7 +1259,7 @@ xfs_iread_extents( goto out_brelse; } xfs_bmbt_disk_get_all(frp, &new); - xfs_iext_insert(ip, &icur, 1, &new, state); + xfs_iext_insert(ip, &icur, &new, state); trace_xfs_read_extent(ip, &icur, state, _THIS_IP_); xfs_iext_next(ifp, &icur); } @@ -1815,7 +1815,7 @@ xfs_bmap_add_extent_delay_real( PREV.br_blockcount = temp; PREV.br_startblock = nullstartblock(da_new); xfs_iext_next(ifp, &bma->icur); - xfs_iext_insert(bma->ip, &bma->icur, 1, &PREV, state); + xfs_iext_insert(bma->ip, &bma->icur, &PREV, state); xfs_iext_prev(ifp, &bma->icur); break; @@ -1891,7 +1891,7 @@ xfs_bmap_add_extent_delay_real( PREV.br_startblock = nullstartblock(da_new); PREV.br_blockcount = temp; - xfs_iext_insert(bma->ip, &bma->icur, 1, &PREV, state); + xfs_iext_insert(bma->ip, &bma->icur, &PREV, state); xfs_iext_next(ifp, &bma->icur); break; @@ -1937,9 +1937,9 @@ xfs_bmap_add_extent_delay_real( PREV.br_blockcount)); xfs_iext_update_extent(bma->ip, state, &bma->icur, &PREV); - /* insert LEFT (r[0]) and RIGHT (r[1]) at the same time */ xfs_iext_next(ifp, &bma->icur); - xfs_iext_insert(bma->ip, &bma->icur, 2, &LEFT, state); + xfs_iext_insert(bma->ip, &bma->icur, &RIGHT, state); + xfs_iext_insert(bma->ip, &bma->icur, &LEFT, state); (*nextents)++; if (bma->cur == NULL) @@ -2303,7 +2303,7 @@ xfs_bmap_add_extent_unwritten_real( PREV.br_blockcount -= new->br_blockcount; xfs_iext_update_extent(ip, state, icur, &PREV); - xfs_iext_insert(ip, icur, 1, new, state); + xfs_iext_insert(ip, icur, new, state); XFS_IFORK_NEXT_SET(ip, whichfork, XFS_IFORK_NEXTENTS(ip, whichfork) + 1); if (cur == NULL) @@ -2370,7 +2370,7 @@ xfs_bmap_add_extent_unwritten_real( xfs_iext_update_extent(ip, state, icur, &PREV); xfs_iext_next(ifp, icur); - xfs_iext_insert(ip, icur, 1, new, state); + xfs_iext_insert(ip, icur, new, state); XFS_IFORK_NEXT_SET(ip, whichfork, XFS_IFORK_NEXTENTS(ip, whichfork) + 1); @@ -2413,7 +2413,8 @@ xfs_bmap_add_extent_unwritten_real( xfs_iext_update_extent(ip, state, icur, &PREV); xfs_iext_next(ifp, icur); - xfs_iext_insert(ip, icur, 2, &r[0], state); + xfs_iext_insert(ip, icur, &r[1], state); + xfs_iext_insert(ip, icur, &r[0], state); XFS_IFORK_NEXT_SET(ip, whichfork, XFS_IFORK_NEXTENTS(ip, whichfork) + 2); @@ -2621,7 +2622,7 @@ xfs_bmap_add_extent_hole_delay( * Insert a new entry. */ oldlen = newlen = 0; - xfs_iext_insert(ip, icur, 1, new, state); + xfs_iext_insert(ip, icur, new, state); break; } if (oldlen != newlen) { @@ -2805,7 +2806,7 @@ xfs_bmap_add_extent_hole_real( * real allocation. * Insert a new entry. */ - xfs_iext_insert(ip, icur, 1, new, state); + xfs_iext_insert(ip, icur, new, state); XFS_IFORK_NEXT_SET(ip, whichfork, XFS_IFORK_NEXTENTS(ip, whichfork) + 1); if (cur == NULL) { @@ -4728,7 +4729,7 @@ xfs_bmap_del_extent_delay( xfs_iext_update_extent(ip, state, icur, got); xfs_iext_next(ifp, icur); - xfs_iext_insert(ip, icur, 1, &new, state); + xfs_iext_insert(ip, icur, &new, state); da_new = got_indlen + new_indlen - stolen; del->br_blockcount -= stolen; @@ -4809,7 +4810,7 @@ xfs_bmap_del_extent_cow( xfs_iext_update_extent(ip, state, icur, got); xfs_iext_next(ifp, icur); - xfs_iext_insert(ip, icur, 1, &new, state); + xfs_iext_insert(ip, icur, &new, state); break; } } @@ -5022,7 +5023,7 @@ xfs_bmap_del_extent_real( XFS_IFORK_NEXT_SET(ip, whichfork, XFS_IFORK_NEXTENTS(ip, whichfork) + 1); xfs_iext_next(ifp, icur); - xfs_iext_insert(ip, icur, 1, &new, state); + xfs_iext_insert(ip, icur, &new, state); break; } @@ -5884,7 +5885,7 @@ xfs_bmap_split_extent_at( /* Add new extent */ xfs_iext_next(ifp, &icur); - xfs_iext_insert(ip, &icur, 1, &new, 0); + xfs_iext_insert(ip, &icur, &new, 0); XFS_IFORK_NEXT_SET(ip, whichfork, XFS_IFORK_NEXTENTS(ip, whichfork) + 1); diff --git a/libxfs/xfs_iext_tree.c b/libxfs/xfs_iext_tree.c index 6773cf88e..5be9bff04 100644 --- a/libxfs/xfs_iext_tree.c +++ b/libxfs/xfs_iext_tree.c @@ -619,16 +619,20 @@ xfs_iext_realloc_root( cur->leaf = new; } -static void -__xfs_iext_insert( - struct xfs_ifork *ifp, +void +xfs_iext_insert( + struct xfs_inode *ip, struct xfs_iext_cursor *cur, - struct xfs_bmbt_irec *irec) + struct xfs_bmbt_irec *irec, + int state) { + struct xfs_ifork *ifp = xfs_iext_state_to_fork(ip, state); xfs_fileoff_t offset = irec->br_startoff; struct xfs_iext_leaf *new = NULL; int nr_entries, i; + trace_xfs_iext_insert(ip, cur, state, _RET_IP_); + if (ifp->if_height == 0) xfs_iext_alloc_root(ifp, cur); else if (ifp->if_height == 1) @@ -656,25 +660,6 @@ __xfs_iext_insert( xfs_iext_insert_node(ifp, xfs_iext_leaf_key(new, 0), new, 2); } -void -xfs_iext_insert( - struct xfs_inode *ip, - struct xfs_iext_cursor *cur, - xfs_extnum_t nr_extents, - struct xfs_bmbt_irec *new, - int state) -{ - struct xfs_ifork *ifp = xfs_iext_state_to_fork(ip, state); - int i; - - ASSERT(nr_extents > 0); - - for (i = nr_extents - 1; i >= 0; i--) { - __xfs_iext_insert(ifp, cur, new + i); - trace_xfs_iext_insert(ip, cur, state, _RET_IP_); - } -} - static struct xfs_iext_node * xfs_iext_rebalance_node( struct xfs_iext_node *parent, diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c index 43d076352..b647f6341 100644 --- a/libxfs/xfs_inode_fork.c +++ b/libxfs/xfs_inode_fork.c @@ -359,7 +359,7 @@ xfs_iformat_extents( } xfs_bmbt_disk_get_all(dp, &new); - xfs_iext_insert(ip, &icur, 1, &new, state); + xfs_iext_insert(ip, &icur, &new, state); trace_xfs_read_extent(ip, &icur, state, _THIS_IP_); xfs_iext_next(ifp, &icur); } diff --git a/libxfs/xfs_inode_fork.h b/libxfs/xfs_inode_fork.h index 184217076..84b5e6f8b 100644 --- a/libxfs/xfs_inode_fork.h +++ b/libxfs/xfs_inode_fork.h @@ -114,7 +114,7 @@ void xfs_init_local_fork(struct xfs_inode *, int, const void *, int); xfs_extnum_t xfs_iext_count(struct xfs_ifork *ifp); void xfs_iext_insert(struct xfs_inode *, struct xfs_iext_cursor *cur, - xfs_extnum_t, struct xfs_bmbt_irec *, int); + struct xfs_bmbt_irec *, int); void xfs_iext_remove(struct xfs_inode *, struct xfs_iext_cursor *, int, int); void xfs_iext_destroy(struct xfs_ifork *);