Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5cfbc22 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: replace xfs_bmbt_lookup_ge with xfs_bmbt_lookup_first 



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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent e16cf9b0

fs/xfs/libxfs/xfs_bmap.c

+6 −8
Original line number Diff line number Diff line
@@ -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);