Skip to content

Commit

Permalink
xfs: remove spurious shutdown type check from xfs_bmap_finish()
Browse files Browse the repository at this point in the history
The static checker reports that after commit 8d99fe9 ("xfs: fix
efi/efd error handling to avoid fs shutdown hangs"), the code has been
reworked such that error == -EFSCORRUPTED is not possible in this
codepath.

Remove the spurious error check and just use SHUTDOWN_META_IO_ERROR
unconditionally.

Signed-off-by: Brian Foster <[email protected]>
Reviewed-by: Carlos Maiolino <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: Dave Chinner <[email protected]>
  • Loading branch information
Brian Foster authored and dchinner committed Jun 1, 2016
1 parent a3916e5 commit 0c871f9
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions fs/xfs/xfs_bmap_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,7 @@ xfs_bmap_finish(
if (committed) {
xfs_efi_release(efi);
xfs_force_shutdown((*tp)->t_mountp,
(error == -EFSCORRUPTED) ?
SHUTDOWN_CORRUPT_INCORE :
SHUTDOWN_META_IO_ERROR);
SHUTDOWN_META_IO_ERROR);
}
return error;
}
Expand Down

0 comments on commit 0c871f9

Please sign in to comment.