xfs: remove spurious shutdown type check from xfs_bmap_finish()
authorBrian Foster <bfoster@redhat.com>
Wed, 1 Jun 2016 07:38:15 +0000 (17:38 +1000)
committerDave Chinner <david@fromorbit.com>
Wed, 1 Jun 2016 07:38:15 +0000 (17:38 +1000)
The static checker reports that after commit 8d99fe92fed0 ("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 <bfoster@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>
fs/xfs/xfs_bmap_util.c

index 586bb64e674bac152c54e7de2255400c7e00e965..3ce3c61af32a481108d50e64407e295013679d87 100644 (file)
@@ -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;
        }