hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Darrick J. Wong 2021-03-22 09:51:53 -07:00
parent de9d2a78ad
commit f53acface7
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/xfs/scrub/agheader.c
View File

@ -477,16 +477,13 @@ xchk_agf_xref(
{ {
struct xfs_mount *mp = sc->mp; struct xfs_mount *mp = sc->mp;
xfs_agblock_t agbno; xfs_agblock_t agbno;
int error;
if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT) if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)
return; return;
agbno = XFS_AGF_BLOCK(mp); agbno = XFS_AGF_BLOCK(mp);
error = xchk_ag_btcur_init(sc, &sc->sa); xchk_ag_btcur_init(sc, &sc->sa);
if (error)
return;
xchk_xref_is_used_space(sc, agbno, 1); xchk_xref_is_used_space(sc, agbno, 1);
xchk_agf_xref_freeblks(sc); xchk_agf_xref_freeblks(sc);
@ -660,16 +657,13 @@ xchk_agfl_xref(
{ {
struct xfs_mount *mp = sc->mp; struct xfs_mount *mp = sc->mp;
xfs_agblock_t agbno; xfs_agblock_t agbno;
int error;
if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT) if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)
return; return;
agbno = XFS_AGFL_BLOCK(mp); agbno = XFS_AGFL_BLOCK(mp);
error = xchk_ag_btcur_init(sc, &sc->sa); xchk_ag_btcur_init(sc, &sc->sa);
if (error)
return;
xchk_xref_is_used_space(sc, agbno, 1); xchk_xref_is_used_space(sc, agbno, 1);
xchk_xref_is_not_inode_chunk(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; struct xfs_mount *mp = sc->mp;
xfs_agblock_t agbno; xfs_agblock_t agbno;
int error;
if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT) if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)
return; return;
agbno = XFS_AGI_BLOCK(mp); agbno = XFS_AGI_BLOCK(mp);
error = xchk_ag_btcur_init(sc, &sc->sa); xchk_ag_btcur_init(sc, &sc->sa);
if (error)
return;
xchk_xref_is_used_space(sc, agbno, 1); xchk_xref_is_used_space(sc, agbno, 1);
xchk_xref_is_not_inode_chunk(sc, agbno, 1); xchk_xref_is_not_inode_chunk(sc, agbno, 1);

7
fs/xfs/scrub/common.c
View File

@ -452,7 +452,7 @@ xchk_ag_btcur_free(
} }
/* Initialize all the btree cursors for an AG. */ /* Initialize all the btree cursors for an AG. */
int void
xchk_ag_btcur_init( xchk_ag_btcur_init(
struct xfs_scrub *sc, struct xfs_scrub *sc,
struct xchk_ag *sa) struct xchk_ag *sa)
@ -502,8 +502,6 @@ xchk_ag_btcur_init(
sa->refc_cur = xfs_refcountbt_init_cursor(mp, sc->tp, sa->refc_cur = xfs_refcountbt_init_cursor(mp, sc->tp,
sa->agf_bp, agno); sa->agf_bp, agno);
} }
return 0;
} }
/* Release the AG header context and btree cursors. */ /* Release the AG header context and btree cursors. */
@ -551,7 +549,8 @@ xchk_ag_init(
if (error) if (error)
return error; return error;
return xchk_ag_btcur_init(sc, sa); xchk_ag_btcur_init(sc, sa);
return 0;
} }
/* /*

2
fs/xfs/scrub/common.h
View File

@ -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, int xchk_ag_read_headers(struct xfs_scrub *sc, xfs_agnumber_t agno,
struct xchk_ag *sa); struct xchk_ag *sa);
void xchk_ag_btcur_free(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, 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); const struct xfs_owner_info *oinfo, xfs_filblks_t *blocks);