diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2020-03-17 03:12:34 +0300 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2020-03-18 18:12:23 +0300 |
| commit | 37a6547d92af4d16778cead78ef2f9233f5573fe (patch) | |
| tree | 19624e2a5c66a78b3f08395c193644e13a53880b /fs/xfs/scrub | |
| parent | 77ca1eed5a7d2bf0905562eb1a15aac76bc19fe4 (diff) | |
| download | linux-37a6547d92af4d16778cead78ef2f9233f5573fe.tar.xz | |
xfs: xrep_reap_extents should not destroy the bitmap
Remove the xfs_bitmap_destroy call from the end of xrep_reap_extents
because this sort of violates our rule that the function initializing a
structure should destroy it.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Diffstat (limited to 'fs/xfs/scrub')
| -rw-r--r-- | fs/xfs/scrub/agheader_repair.c | 2 | ||||
| -rw-r--r-- | fs/xfs/scrub/repair.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/xfs/scrub/agheader_repair.c b/fs/xfs/scrub/agheader_repair.c index 73e6efd76877..fb615207d4a9 100644 --- a/fs/xfs/scrub/agheader_repair.c +++ b/fs/xfs/scrub/agheader_repair.c @@ -696,7 +696,7 @@ xrep_agfl( goto err; /* Dump any AGFL overflow. */ - return xrep_reap_extents(sc, &agfl_extents, &XFS_RMAP_OINFO_AG, + error = xrep_reap_extents(sc, &agfl_extents, &XFS_RMAP_OINFO_AG, XFS_AG_RESV_AGFL); err: xfs_bitmap_destroy(&agfl_extents); diff --git a/fs/xfs/scrub/repair.c b/fs/xfs/scrub/repair.c index 0d5509bf8581..4ff24501e8ac 100644 --- a/fs/xfs/scrub/repair.c +++ b/fs/xfs/scrub/repair.c @@ -617,11 +617,9 @@ xrep_reap_extents( error = xrep_reap_block(sc, fsbno, oinfo, type); if (error) - goto out; + break; } -out: - xfs_bitmap_destroy(bitmap); return error; } |