From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 17/19] xfs: replace xfs_bmbt_lookup_ge with xfs_bmbt_lookup_first
Date: Fri, 22 Sep 2017 06:59:43 -0700 [thread overview]
Message-ID: <20170922135945.31574-18-hch@lst.de> (raw)
In-Reply-To: <20170922135945.31574-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>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.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 41da4b63130f..14cf58e5a3e2 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
next prev parent reply other threads:[~2017-09-22 13:59 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-22 13:59 refactor extent manipulation V4 Christoph Hellwig
2017-09-22 13:59 ` [PATCH 01/19] xfs: fix incorrect extent state in xfs_bmap_add_extent_unwritten_real Christoph Hellwig
2017-09-22 13:59 ` [PATCH 02/19] xfs: use xfs_iext_get_extent instead of open coding it Christoph Hellwig
2017-09-22 13:59 ` [PATCH 03/19] xfs: don't set XFS_BTCUR_BPRV_WASDEL in xfs_bunmapi Christoph Hellwig
2017-09-22 13:59 ` [PATCH 04/19] xfs: rename bno to end in __xfs_bunmapi Christoph Hellwig
2017-09-22 13:59 ` [PATCH 05/19] xfs: use xfs_bmap_del_extent_delay for the data fork as well Christoph Hellwig
2017-09-22 13:59 ` [PATCH 06/19] xfs: move some more code into xfs_bmap_del_extent_real Christoph Hellwig
2017-09-22 13:59 ` [PATCH 07/19] xfs: use correct state defines in xfs_bmap_del_extent_{cow,delay} Christoph Hellwig
2017-09-22 13:59 ` [PATCH 08/19] xfs: use the state defines in xfs_bmap_del_extent_real Christoph Hellwig
2017-09-22 13:59 ` [PATCH 09/19] xfs: refactor xfs_del_extent_real Christoph Hellwig
2017-09-22 13:59 ` [PATCH 10/19] xfs: refactor xfs_bmap_add_extent_hole_delay Christoph Hellwig
2017-09-22 13:59 ` [PATCH 11/19] xfs: refactor xfs_bmap_add_extent_hole_real Christoph Hellwig
2017-09-22 13:59 ` [PATCH 12/19] xfs: refactor xfs_bmap_add_extent_delay_real Christoph Hellwig
2017-09-22 15:31 ` Brian Foster
2017-09-22 16:12 ` Darrick J. Wong
2017-09-22 13:59 ` [PATCH 13/19] xfs: refactor delalloc accounting in xfs_bmap_add_extent_delay_real Christoph Hellwig
2017-09-22 13:59 ` [PATCH 14/19] xfs: refactor xfs_bmap_add_extent_unwritten_real Christoph Hellwig
2017-09-22 13:59 ` [PATCH 15/19] xfs: pass a struct xfs_bmbt_irec to xfs_bmbt_update Christoph Hellwig
2017-09-22 13:59 ` [PATCH 16/19] xfs: pass a struct xfs_bmbt_irec to xfs_bmbt_lookup_eq Christoph Hellwig
2017-09-22 13:59 ` Christoph Hellwig [this message]
2017-09-22 13:59 ` [PATCH 18/19] xfs: remove all xfs_bmbt_set_* helpers except for xfs_bmbt_set_all Christoph Hellwig
2017-09-22 13:59 ` [PATCH 19/19] xfs: remove xfs_bmbt_get_state Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2017-09-18 15:24 refactor extent manipulation V3 Christoph Hellwig
2017-09-18 15:24 ` [PATCH 17/19] xfs: replace xfs_bmbt_lookup_ge with xfs_bmbt_lookup_first Christoph Hellwig
2017-09-20 22:27 ` 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=20170922135945.31574-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 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).