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

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

[Brian Foster]

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>
---
 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

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

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

[Carlos Maiolino]

On Wed, May 18, 2016 at 08:04:12AM -0400, Brian Foster wrote:
> 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>

> ---
>  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
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

-- 
Carlos

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

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

[Christoph Hellwig]

Looks fine,

Reviewed-by: Christoph Hellwig <hch@lst.de>

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs