All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 17/18] xfs: remove the nr_extents argument to xfs_iext_insert
Date: Tue, 31 Oct 2017 16:22:29 +0200	[thread overview]
Message-ID: <20171031142230.11755-18-hch@lst.de> (raw)
In-Reply-To: <20171031142230.11755-1-hch@lst.de>

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>
---
 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 46bda00dca79..b832dc402f40 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -900,7 +900,7 @@ xfs_bmap_local_to_extents(
 	rec.br_blockcount = 1;
 	rec.br_state = XFS_EXT_NORM;
 	xfs_iext_first(ifp, &ext);
-	xfs_iext_insert(ip, &ext, 1, &rec, 0);
+	xfs_iext_insert(ip, &ext, &rec, 0);
 
 	XFS_IFORK_NEXT_SET(ip, whichfork, 1);
 	ip->i_d.di_nblocks = 1;
@@ -1272,7 +1272,7 @@ xfs_iread_extents(
 				goto out_brelse;
 			}
 			xfs_bmbt_disk_get_all(frp, &new);
-			xfs_iext_insert(ip, &ext, 1, &new, state);
+			xfs_iext_insert(ip, &ext, &new, state);
 			trace_xfs_read_extent(ip, &ext, state, _THIS_IP_);
 			xfs_iext_next(ifp, &ext);
 		}
@@ -1828,7 +1828,7 @@ xfs_bmap_add_extent_delay_real(
 		PREV.br_blockcount = temp;
 		PREV.br_startblock = nullstartblock(da_new);
 		xfs_iext_next(ifp, &bma->ext);
-		xfs_iext_insert(bma->ip, &bma->ext, 1, &PREV, state);
+		xfs_iext_insert(bma->ip, &bma->ext, &PREV, state);
 		xfs_iext_prev(ifp, &bma->ext);
 		break;
 
@@ -1904,7 +1904,7 @@ xfs_bmap_add_extent_delay_real(
 
 		PREV.br_startblock = nullstartblock(da_new);
 		PREV.br_blockcount = temp;
-		xfs_iext_insert(bma->ip, &bma->ext, 1, &PREV, state);
+		xfs_iext_insert(bma->ip, &bma->ext, &PREV, state);
 		xfs_iext_next(ifp, &bma->ext);
 		break;
 
@@ -1950,9 +1950,9 @@ xfs_bmap_add_extent_delay_real(
 					PREV.br_blockcount));
 		xfs_iext_update_extent(bma->ip, state, &bma->ext, &PREV);
 
-		/* insert LEFT (r[0]) and RIGHT (r[1]) at the same time */
 		xfs_iext_next(ifp, &bma->ext);
-		xfs_iext_insert(bma->ip, &bma->ext, 2, &LEFT, state);
+		xfs_iext_insert(bma->ip, &bma->ext, &RIGHT, state);
+		xfs_iext_insert(bma->ip, &bma->ext, &LEFT, state);
 		(*nextents)++;
 
 		if (bma->cur == NULL)
@@ -2316,7 +2316,7 @@ xfs_bmap_add_extent_unwritten_real(
 		PREV.br_blockcount -= new->br_blockcount;
 
 		xfs_iext_update_extent(ip, state, ext, &PREV);
-		xfs_iext_insert(ip, ext, 1, new, state);
+		xfs_iext_insert(ip, ext, new, state);
 		XFS_IFORK_NEXT_SET(ip, whichfork,
 				XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
 		if (cur == NULL)
@@ -2383,7 +2383,7 @@ xfs_bmap_add_extent_unwritten_real(
 
 		xfs_iext_update_extent(ip, state, ext, &PREV);
 		xfs_iext_next(ifp, ext);
-		xfs_iext_insert(ip, ext, 1, new, state);
+		xfs_iext_insert(ip, ext, new, state);
 
 		XFS_IFORK_NEXT_SET(ip, whichfork,
 				XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
@@ -2426,7 +2426,8 @@ xfs_bmap_add_extent_unwritten_real(
 
 		xfs_iext_update_extent(ip, state, ext, &PREV);
 		xfs_iext_next(ifp, ext);
-		xfs_iext_insert(ip, ext, 2, &r[0], state);
+		xfs_iext_insert(ip, ext, &r[1], state);
+		xfs_iext_insert(ip, ext, &r[0], state);
 
 		XFS_IFORK_NEXT_SET(ip, whichfork,
 				XFS_IFORK_NEXTENTS(ip, whichfork) + 2);
@@ -2634,7 +2635,7 @@ xfs_bmap_add_extent_hole_delay(
 		 * Insert a new entry.
 		 */
 		oldlen = newlen = 0;
-		xfs_iext_insert(ip, ext, 1, new, state);
+		xfs_iext_insert(ip, ext, new, state);
 		break;
 	}
 	if (oldlen != newlen) {
@@ -2818,7 +2819,7 @@ xfs_bmap_add_extent_hole_real(
 		 * real allocation.
 		 * Insert a new entry.
 		 */
-		xfs_iext_insert(ip, ext, 1, new, state);
+		xfs_iext_insert(ip, ext, new, state);
 		XFS_IFORK_NEXT_SET(ip, whichfork,
 			XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
 		if (cur == NULL) {
@@ -4741,7 +4742,7 @@ xfs_bmap_del_extent_delay(
 
 		xfs_iext_update_extent(ip, state, ext, got);
 		xfs_iext_next(ifp, ext);
-		xfs_iext_insert(ip, ext, 1, &new, state);
+		xfs_iext_insert(ip, ext, &new, state);
 
 		da_new = got_indlen + new_indlen - stolen;
 		del->br_blockcount -= stolen;
@@ -4822,7 +4823,7 @@ xfs_bmap_del_extent_cow(
 
 		xfs_iext_update_extent(ip, state, ext, got);
 		xfs_iext_next(ifp, ext);
-		xfs_iext_insert(ip, ext, 1, &new, state);
+		xfs_iext_insert(ip, ext, &new, state);
 		break;
 	}
 }
@@ -5035,7 +5036,7 @@ xfs_bmap_del_extent_real(
 		XFS_IFORK_NEXT_SET(ip, whichfork,
 			XFS_IFORK_NEXTENTS(ip, whichfork) + 1);
 		xfs_iext_next(ifp, ext);
-		xfs_iext_insert(ip, ext, 1, &new, state);
+		xfs_iext_insert(ip, ext, &new, state);
 		break;
 	}
 
@@ -5896,7 +5897,7 @@ xfs_bmap_split_extent_at(
 
 	/* Add new extent */
 	xfs_iext_next(ifp, &ext);
-	xfs_iext_insert(ip, &ext, 1, &new, 0);
+	xfs_iext_insert(ip, &ext, &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 acb66c0677e7..c109526e52c5 100644
--- a/fs/xfs/libxfs/xfs_iext_tree.c
+++ b/fs/xfs/libxfs/xfs_iext_tree.c
@@ -627,16 +627,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)
@@ -664,25 +668,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 2711ff6ab2b3..dca5dcec2cd4 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, &ext, 1, &new, state);
+			xfs_iext_insert(ip, &ext, &new, state);
 			trace_xfs_read_extent(ip, &ext, state, _THIS_IP_);
 			xfs_iext_next(ifp, &ext);
 		}
diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h
index 015872caaab4..cc73fea4e37e 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.14.2


  parent reply	other threads:[~2017-10-31 14:23 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-31 14:22 b+tree for the incore extent list Christoph Hellwig
2017-10-31 14:22 ` [PATCH 01/18] xfs: pass an on-disk extent to xfs_bmbt_validate_extent Christoph Hellwig
2017-10-31 17:53   ` Brian Foster
2017-10-31 21:15     ` Darrick J. Wong
2017-11-01 13:58       ` Brian Foster
2017-11-01 23:00         ` Darrick J. Wong
2017-11-02 11:57           ` Brian Foster
2017-11-02 16:05             ` Darrick J. Wong
2017-11-02 16:54               ` Brian Foster
2017-11-02 18:42                 ` Christoph Hellwig
2017-11-02 19:35                   ` Brian Foster
2017-11-02 23:45             ` Dave Chinner
2017-10-31 14:22 ` [PATCH 02/18] xfs: don't create overlapping extents in xfs_bmap_add_extent_delay_real Christoph Hellwig
2017-10-31 17:53   ` Brian Foster
2017-10-31 21:34   ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 03/18] xfs: treat idx as a cursor " Christoph Hellwig
2017-10-31 17:53   ` Brian Foster
2017-10-31 21:35   ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 04/18] xfs: treat idx as a cursor in xfs_bmap_add_extent_hole_delay Christoph Hellwig
2017-10-31 17:53   ` Brian Foster
2017-10-31 21:35   ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 05/18] xfs: treat idx as a cursor in xfs_bmap_add_extent_hole_real Christoph Hellwig
2017-10-31 17:53   ` Brian Foster
2017-10-31 21:35   ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 06/18] xfs: treat idx as a cursor in xfs_bmap_add_extent_unwritten_real Christoph Hellwig
2017-10-31 17:53   ` Brian Foster
2017-10-31 21:36   ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 07/18] xfs: treat idx as a cursor in xfs_bmap_del_extent_* Christoph Hellwig
2017-10-31 17:53   ` Brian Foster
2017-10-31 21:37   ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 08/18] xfs: treat idx as a cursor in xfs_bmap_collapse_extents Christoph Hellwig
2017-10-31 17:53   ` Brian Foster
2017-10-31 21:37   ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 09/18] xfs: allow unaligned extent records in xfs_bmbt_disk_set_all Christoph Hellwig
2017-10-31 21:34   ` Darrick J. Wong
2017-11-02 13:54   ` Brian Foster
2017-10-31 14:22 ` [PATCH 10/18] xfs: iterate over extents in xfs_iextents_copy Christoph Hellwig
2017-10-31 21:41   ` Darrick J. Wong
2017-11-02 13:54   ` Brian Foster
2017-10-31 14:22 ` [PATCH 11/18] xfs: iterate over extents in xfs_bmap_extents_to_btree Christoph Hellwig
2017-10-31 21:41   ` Darrick J. Wong
2017-11-02 13:54   ` Brian Foster
2017-10-31 14:22 ` [PATCH 12/18] xfs: introduce the xfs_iext_cursor abstraction Christoph Hellwig
2017-10-31 22:02   ` Darrick J. Wong
2017-11-02 18:49     ` Christoph Hellwig
2017-11-02 19:01       ` Darrick J. Wong
2017-11-02 19:11         ` Christoph Hellwig
2017-11-02 17:14   ` Brian Foster
2017-11-02 18:51     ` Christoph Hellwig
2017-11-02 19:36       ` Brian Foster
2017-11-03  7:26     ` Christoph Hellwig
2017-10-31 14:22 ` [PATCH 13/18] xfs: iterate backwards in xfs_reflink_cancel_cow_blocks Christoph Hellwig
2017-10-31 22:10   ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 14/18] xfs: simplify xfs_reflink_convert_cow Christoph Hellwig
2017-10-31 22:20   ` Darrick J. Wong
2017-11-02 18:56     ` Christoph Hellwig
2017-10-31 14:22 ` [PATCH 15/18] xfs: remove support for inlining data/extents into the inode fork Christoph Hellwig
2017-10-31 22:35   ` Darrick J. Wong
2017-11-02 18:57     ` Christoph Hellwig
2017-11-02 19:26       ` Darrick J. Wong
2017-11-02 21:43         ` Dave Chinner
2017-11-02 22:08           ` Darrick J. Wong
2017-10-31 14:22 ` [PATCH 16/18] xfs: use a b+tree for the in-core extent list Christoph Hellwig
2017-11-01 18:47   ` Darrick J. Wong
2017-11-02  0:16     ` Darrick J. Wong
2017-11-02  6:03       ` Christoph Hellwig
2017-11-02  0:14   ` Darrick J. Wong
2017-11-02 19:09     ` Christoph Hellwig
2017-10-31 14:22 ` Christoph Hellwig [this message]
2017-10-31 22:35   ` [PATCH 17/18] xfs: remove the nr_extents argument to xfs_iext_insert Darrick J. Wong
2017-10-31 14:22 ` [PATCH 18/18] xfs: remove the nr_extents argument to xfs_iext_remove Christoph Hellwig
2017-10-31 22:37   ` Darrick J. Wong
2017-11-01  3:08 ` b+tree for the incore extent list Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171031142230.11755-18-hch@lst.de \
    --to=hch@lst.de \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.