Commit f53acfac authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: remove return value from xchk_ag_btcur_init 



Functions called by this function cannot fail, so get rid of the return
and error checking.

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

fs/xfs/scrub/agheader.c

+3 −12
Original line number Diff line number Diff line
@@ -477,16 +477,13 @@ xchk_agf_xref( 
{

	struct xfs_mount	*mp = sc->mp;

	xfs_agblock_t		agbno;

	int			error;



	if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)

		return;



	agbno = XFS_AGF_BLOCK(mp);



	error = xchk_ag_btcur_init(sc, &sc->sa);

	if (error)

		return;

	xchk_ag_btcur_init(sc, &sc->sa);



	xchk_xref_is_used_space(sc, agbno, 1);

	xchk_agf_xref_freeblks(sc);
@@ -660,16 +657,13 @@ xchk_agfl_xref( 
{

	struct xfs_mount	*mp = sc->mp;

	xfs_agblock_t		agbno;

	int			error;



	if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)

		return;



	agbno = XFS_AGFL_BLOCK(mp);



	error = xchk_ag_btcur_init(sc, &sc->sa);

	if (error)

		return;

	xchk_ag_btcur_init(sc, &sc->sa);



	xchk_xref_is_used_space(sc, agbno, 1);

	xchk_xref_is_not_inode_chunk(sc, agbno, 1);
@@ -813,16 +807,13 @@ xchk_agi_xref( 
{

	struct xfs_mount	*mp = sc->mp;

	xfs_agblock_t		agbno;

	int			error;



	if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)

		return;



	agbno = XFS_AGI_BLOCK(mp);



	error = xchk_ag_btcur_init(sc, &sc->sa);

	if (error)

		return;

	xchk_ag_btcur_init(sc, &sc->sa);



	xchk_xref_is_used_space(sc, agbno, 1);

	xchk_xref_is_not_inode_chunk(sc, agbno, 1);

fs/xfs/scrub/common.c

+3 −4
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ xchk_ag_btcur_free( 
}



/* Initialize all the btree cursors for an AG. */

int

void

xchk_ag_btcur_init(

	struct xfs_scrub	*sc,

	struct xchk_ag		*sa)
@@ -502,8 +502,6 @@ xchk_ag_btcur_init( 
		sa->refc_cur = xfs_refcountbt_init_cursor(mp, sc->tp,

				sa->agf_bp, agno);

	}



	return 0;

}



/* Release the AG header context and btree cursors. */
@@ -551,7 +549,8 @@ xchk_ag_init( 
	if (error)

		return error;



	return xchk_ag_btcur_init(sc, sa);

	xchk_ag_btcur_init(sc, sa);

	return 0;

}



/*

fs/xfs/scrub/common.h

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ void xchk_perag_get(struct xfs_mount *mp, struct xchk_ag *sa); 
int xchk_ag_read_headers(struct xfs_scrub *sc, xfs_agnumber_t agno,

		struct xchk_ag *sa);

void xchk_ag_btcur_free(struct xchk_ag *sa);

int xchk_ag_btcur_init(struct xfs_scrub *sc, struct xchk_ag *sa);

void xchk_ag_btcur_init(struct xfs_scrub *sc, struct xchk_ag *sa);

int xchk_count_rmap_ownedby_ag(struct xfs_scrub *sc, struct xfs_btree_cur *cur,

		const struct xfs_owner_info *oinfo, xfs_filblks_t *blocks);