OSDN Git Service

xfs: replace xfs_bmbt_lookup_ge with xfs_bmbt_lookup_first
authorChristoph Hellwig <hch@lst.de>
Tue, 17 Oct 2017 21:16:27 +0000 (14:16 -0700)
committerDarrick J. Wong <darrick.wong@oracle.com>
Thu, 26 Oct 2017 22:38:22 +0000 (15:38 -0700)
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>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
fs/xfs/libxfs/xfs_bmap.c

index 0033471..dd6672b 100644 (file)
@@ -120,16 +120,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);
 }
 
@@ -965,7 +962,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);