xfs: refactor xfs_verifier_error and xfs_buf_ioerror

Since all verification errors also mark the buffer as having an error,
we can combine these two calls.  Later we'll add a xfs_failaddr_t
parameter to promote the idea of reporting corruption errors and the
address of the failing check to enable better debugging reports.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
This commit is contained in:
Darrick J. Wong
2018-01-08 10:51:02 -08:00
parent 9101d3707b
commit 31ca03c92c
23 changed files with 89 additions and 151 deletions

View File

@@ -640,11 +640,10 @@ xfs_sb_read_verify(
error = xfs_sb_verify(bp, true);
out_error:
if (error) {
if (error == -EFSCORRUPTED || error == -EFSBADCRC)
xfs_verifier_error(bp, error);
else if (error)
xfs_buf_ioerror(bp, error);
if (error == -EFSCORRUPTED || error == -EFSBADCRC)
xfs_verifier_error(bp);
}
}
/*
@@ -678,8 +677,7 @@ xfs_sb_write_verify(
error = xfs_sb_verify(bp, false);
if (error) {
xfs_buf_ioerror(bp, error);
xfs_verifier_error(bp);
xfs_verifier_error(bp, error);
return;
}