diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2022-11-06 17:03:19 -0800 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2022-11-16 15:25:04 -0800 |
| commit | 033985b6fe875a7a971cf4e3941e1f3085ba037c (patch) | |
| tree | 93053a582eb1423c2b8ed922d9a01894a86dd938 /fs/xfs | |
| parent | e74331d6fa2c21a8ecccfe0648dad5193b83defe (diff) | |
| download | linux-033985b6fe875a7a971cf4e3941e1f3085ba037c.tar.bz2 | |
xfs: fix perag loop in xchk_bmap_check_rmaps
sparse complains that we can return an uninitialized error from this
function and that pag could be uninitialized. We know that there are no
zero-AG filesystems and hence we had to call xchk_bmap_check_ag_rmaps at
least once, so this is not actually possible, but I'm too worn out from
automated complaints from unsophisticated AIs so let's just fix this and
move on to more interesting problems, eh?
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/scrub/bmap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/xfs/scrub/bmap.c b/fs/xfs/scrub/bmap.c index f0b9cb6506fd..cb203e083a4c 100644 --- a/fs/xfs/scrub/bmap.c +++ b/fs/xfs/scrub/bmap.c @@ -599,14 +599,14 @@ xchk_bmap_check_rmaps( for_each_perag(sc->mp, agno, pag) { error = xchk_bmap_check_ag_rmaps(sc, whichfork, pag); - if (error) - break; - if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT) - break; + if (error || + (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)) { + xfs_perag_put(pag); + return error; + } } - if (pag) - xfs_perag_put(pag); - return error; + + return 0; } /* |