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

xfs: remove the which variable in xchk_iallocbt 



The which variable that holds a btree number is passed to two functions
that ignore it and used in a single check that can check the sm_type
as well.  Remove it to unclutter the code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 4bfb028a

fs/xfs/scrub/ialloc.c

+4 −10
Original line number Diff line number Diff line
@@ -649,8 +649,7 @@ xchk_iallocbt_rec( 
 */

STATIC void

xchk_iallocbt_xref_rmap_btreeblks(

	struct xfs_scrub	*sc,

	int			which)

	struct xfs_scrub	*sc)

{

	xfs_filblks_t		blocks;

	xfs_extlen_t		inobt_blocks = 0;
@@ -688,7 +687,6 @@ xchk_iallocbt_xref_rmap_btreeblks( 
STATIC void

xchk_iallocbt_xref_rmap_inodes(

	struct xfs_scrub	*sc,

	int			which,

	unsigned long long	inodes)

{

	xfs_filblks_t		blocks;
@@ -719,17 +717,14 @@ xchk_iallocbt( 
		.next_startino	= NULLAGINO,

		.next_cluster_ino = NULLAGINO,

	};

	xfs_btnum_t		which;

	int			error;



	switch (sc->sm->sm_type) {

	case XFS_SCRUB_TYPE_INOBT:

		cur = sc->sa.ino_cur;

		which = XFS_BTNUM_INO;

		break;

	case XFS_SCRUB_TYPE_FINOBT:

		cur = sc->sa.fino_cur;

		which = XFS_BTNUM_FINO;

		break;

	default:

		ASSERT(0);
@@ -741,7 +736,7 @@ xchk_iallocbt( 
	if (error)

		return error;



	xchk_iallocbt_xref_rmap_btreeblks(sc, which);

	xchk_iallocbt_xref_rmap_btreeblks(sc);



	/*

	 * If we're scrubbing the inode btree, inode_blocks is the number of
@@ -750,9 +745,8 @@ xchk_iallocbt( 
	 * knows about.  We can't do this for the finobt since it only points

	 * to inode chunks with free inodes.

	 */

	if (which == XFS_BTNUM_INO)

		xchk_iallocbt_xref_rmap_inodes(sc, which, iabt.inodes);



	if (sc->sm->sm_type == XFS_SCRUB_TYPE_INOBT)

		xchk_iallocbt_xref_rmap_inodes(sc, iabt.inodes);

	return error;

}