From c00a73afc7d9010d86a0c88af5b90b827d25d796 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 3 Nov 2017 10:34:46 -0700
Subject: [PATCH 65/77] xfs: remove the nr_extents argument to xfs_iext_insert
Git-commit: 0254c2f253d6fe11ea2ce5046ed6acfddbe4ee17
Patch-mainline: v4.15-rc1
References: bsc#1095344
We only have two places that insert 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>
Acked-by: Nikolay Borisov <nborisov@suse.com>
---
fs/xfs/libxfs/xfs_bmap.c | 31 ++++++++++++++++---------------
fs/xfs/libxfs/xfs_iext_tree.c | 31 ++++++++-----------------------
fs/xfs/libxfs/xfs_inode_fork.c | 2 +-
fs/xfs/libxfs/xfs_inode_fork.h | 2 +-
4 files changed, 26 insertions(+), 40 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 2b5637b16460..0496b2aff57e 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -917,7 +917,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;
@@ -1284,7 +1284,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);
}
@@ -1840,7 +1840,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;
@@ -1916,7 +1916,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;
@@ -1962,9 +1962,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)
@@ -2328,7 +2328,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)
@@ -2395,7 +2395,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);
@@ -2438,7 +2438,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);
@@ -2646,7 +2647,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) {
@@ -2830,7 +2831,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) {
@@ -4753,7 +4754,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;
@@ -4834,7 +4835,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;
}
}
@@ -5047,7 +5048,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;
}
@@ -5879,7 +5880,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/fs/xfs/libxfs/xfs_iext_tree.c b/fs/xfs/libxfs/xfs_iext_tree.c
index b15f85b80d92..3b5280ec7967 100644
--- a/fs/xfs/libxfs/xfs_iext_tree.c
+++ b/fs/xfs/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/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
index 20110a25150b..af31d5826c32 100644
--- a/fs/xfs/libxfs/xfs_inode_fork.c
+++ b/fs/xfs/libxfs/xfs_inode_fork.c
@@ -362,7 +362,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/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h
index 184217076de8..84b5e6f8bf2c 100644
--- a/fs/xfs/libxfs/xfs_inode_fork.h
+++ b/fs/xfs/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 *);
--
2.7.4