xfs
[Top] [All Lists]

[PATCH] xfs: remove spurious shutdown type check from xfs_bmap_finish()

To: xfs@xxxxxxxxxxx
Subject: [PATCH] xfs: remove spurious shutdown type check from xfs_bmap_finish()
From: Brian Foster <bfoster@xxxxxxxxxx>
Date: Wed, 18 May 2016 08:04:12 -0400
Delivered-to: xfs@xxxxxxxxxxx
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@xxxxxxxxxx>
---
 fs/xfs/xfs_bmap_util.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 3246ebc..918a25a 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -132,9 +132,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;
        }
-- 
2.4.11

<Prev in Thread] Current Thread [Next in Thread>