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: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/scrub/agheader.c b/fs/xfs/scrub/agheader.c
index afe60a9ca93fd50470eac3294f05035baa393b2e..749faa17f8e2fc6c72a774d2d09516b16f4fd7f2 100644 (file)
--- a/fs/xfs/scrub/agheader.c
+++ b/fs/xfs/scrub/agheader.c
@@ -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);

diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c
index 45c5bf37daaac2cbf1c4627ce4f60e54b5fd3a55..da60e7d1f895be4e2a9522d28e523c63d338adf8 100644 (file)
--- a/fs/xfs/scrub/common.c
+++ b/fs/xfs/scrub/common.c
@@ -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;
 }
 
 /*

diff --git a/fs/xfs/scrub/common.h b/fs/xfs/scrub/common.h
index bf94b2db0b967a2abda7921d1a894170356cf5fc..5e2c6f69350308c9143716bf6b20af541327c5f5 100644 (file)
--- a/fs/xfs/scrub/common.h
+++ b/fs/xfs/scrub/common.h
@@ -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);