linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 16/18] xfs: replace xfs_bmbt_lookup_ge with xfs_bmbt_lookup_first
Date: Fri, 15 Sep 2017 07:54:24 -0700	[thread overview]
Message-ID: <20170915145426.26194-17-hch@lst.de> (raw)
In-Reply-To: <20170915145426.26194-1-hch@lst.de>

We only use xfs_bmbt_lookup_ge to look up the first bmap record in an
inode, so replace xfs_bmbt_lookup_ge with a special purpose helper that
is a bit more descriptive.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
---
 fs/xfs/libxfs/xfs_bmap.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 3bb074993141..73498dd7f01a 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -121,16 +121,13 @@ xfs_bmbt_lookup_eq(
 }
 
 STATIC int				/* error */
-xfs_bmbt_lookup_ge(
+xfs_bmbt_lookup_first(
 	struct xfs_btree_cur	*cur,
-	xfs_fileoff_t		off,
-	xfs_fsblock_t		bno,
-	xfs_filblks_t		len,
 	int			*stat)	/* success/failure */
 {
-	cur->bc_rec.b.br_startoff = off;
-	cur->bc_rec.b.br_startblock = bno;
-	cur->bc_rec.b.br_blockcount = len;
+	cur->bc_rec.b.br_startoff = 0;
+	cur->bc_rec.b.br_startblock = 0;
+	cur->bc_rec.b.br_blockcount = 0;
 	return xfs_btree_lookup(cur, XFS_LOOKUP_GE, stat);
 }
 
@@ -978,7 +975,8 @@ xfs_bmap_add_attrfork_btree(
 		cur = xfs_bmbt_init_cursor(mp, tp, ip, XFS_DATA_FORK);
 		cur->bc_private.b.dfops = dfops;
 		cur->bc_private.b.firstblock = *firstblock;
-		if ((error = xfs_bmbt_lookup_ge(cur, 0, 0, 0, &stat)))
+		error = xfs_bmbt_lookup_first(cur, &stat);
+		if (error)
 			goto error0;
 		/* must be at least one entry */
 		XFS_WANT_CORRUPTED_GOTO(mp, stat == 1, error0);
-- 
2.14.1


  parent reply	other threads:[~2017-09-15 14:54 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-15 14:54 refactor extent manipulation V2 Christoph Hellwig
2017-09-15 14:54 ` [PATCH 01/18] xfs: fix incorrect extent state in xfs_bmap_add_extent_unwritten_real Christoph Hellwig
2017-09-15 14:54 ` [PATCH 02/18] xfs: use xfs_iext_get_extent instead of open coding it Christoph Hellwig
2017-09-15 14:54 ` [PATCH 03/18] xfs: don't set XFS_BTCUR_BPRV_WASDEL in xfs_bunmapi Christoph Hellwig
2017-09-15 14:54 ` [PATCH 04/18] xfs: rename bno to end in __xfs_bunmapi Christoph Hellwig
2017-09-15 14:54 ` [PATCH 05/18] xfs: use xfs_bmap_del_extent_delay for the data fork as well Christoph Hellwig
2017-09-15 14:54 ` [PATCH 06/18] xfs: move some more code into xfs_bmap_del_extent_real Christoph Hellwig
2017-09-15 14:54 ` [PATCH 07/18] xfs: use correct state defines in xfs_bmap_del_extent_{cow,delay} Christoph Hellwig
2017-09-15 16:59   ` Brian Foster
2017-09-15 14:54 ` [PATCH 08/18] xfs: use the state defines in xfs_bmap_del_extent_real Christoph Hellwig
2017-09-15 16:59   ` Brian Foster
2017-09-15 14:54 ` [PATCH 09/18] xfs: refactor xfs_del_extent_real Christoph Hellwig
2017-09-15 14:54 ` [PATCH 10/18] xfs: refactor xfs_bmap_add_extent_hole_delay Christoph Hellwig
2017-09-15 14:54 ` [PATCH 11/18] xfs: refactor xfs_bmap_add_extent_hole_real Christoph Hellwig
2017-09-15 14:54 ` [PATCH 12/18] xfs: refactor xfs_bmap_add_extent_delay_real Christoph Hellwig
2017-09-15 17:00   ` Brian Foster
2017-09-17 21:22     ` Christoph Hellwig
2017-09-15 14:54 ` [PATCH 13/18] xfs: refactor xfs_bmap_add_extent_unwritten_real Christoph Hellwig
2017-09-15 14:54 ` [PATCH 14/18] xfs: pass a struct xfs_bmbt_irec to xfs_bmbt_update Christoph Hellwig
2017-09-15 14:54 ` [PATCH 15/18] xfs: pass a struct xfs_bmbt_irec to xfs_bmbt_lookup_eq Christoph Hellwig
2017-09-15 14:54 ` Christoph Hellwig [this message]
2017-09-15 14:54 ` [PATCH 17/18] xfs: remove all xfs_bmbt_set_* helpers except for xfs_bmbt_set_all Christoph Hellwig
2017-09-15 14:54 ` [PATCH 18/18] xfs: remove xfs_bmbt_get_state Christoph Hellwig

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=20170915145426.26194-17-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).