github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 20:54:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

xfs: use goto based error unwinding in xfs_buf_read_map

Browse Source 
This keeps the I/O error handling contained at the end of the function
and removes the indentation for it.  It also allows to reorder the
comments so that they are closer to the logic that they describe.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
This commit is contained in:
Christoph Hellwig 2026-07-15 16:51:02 +02:00 committed by Carlos Maiolino
parent 3d10272743
commit 819f1cc98a
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
fs/xfs/xfs_buf.c
View File

@ -699,6 +699,23 @@ xfs_buf_read_map(
ASSERT(bp->b_ops != NULL || ops == NULL);
}
if (error)
goto out_ioerror;
*bpp = bp;
return 0;
out_ioerror:
/*
* Check against log shutdown for error reporting because metadata
* writeback may require a read first and we need to report errors in
* metadata writeback until the log is shut down. High level
* transaction read functions already check against mount shutdown, so
* we only need to be concerned about low level/ IO interactions here.
*/
if (!xlog_is_shutdown(target->bt_mount->m_log))
xfs_buf_ioerror_alert(bp, fa);
/*
* If we've had a read error, then the contents of the buffer are
* invalid and should not be used. To ensure that a followup read tries
@ -708,30 +725,14 @@ xfs_buf_read_map(
* future cache lookups will also treat it as an empty, uninitialised
* buffer.
*/
if (error) {
/*
* Check against log shutdown for error reporting because
* metadata writeback may require a read first and we need to
* report errors in metadata writeback until the log is shut
* down. High level transaction read functions already check
* against mount shutdown, anyway, so we only need to be
* concerned about low level IO interactions here.
*/
if (!xlog_is_shutdown(target->bt_mount->m_log))
xfs_buf_ioerror_alert(bp, fa);
xfs_buf_clear_flags(bp, XBF_DONE);
xfs_buf_stale(bp);
xfs_buf_relse(bp);
xfs_buf_clear_flags(bp, XBF_DONE);
xfs_buf_stale(bp);
xfs_buf_relse(bp);
/* bad CRC means corrupted metadata */
if (error == -EFSBADCRC)
error = -EFSCORRUPTED;
return error;
}
*bpp = bp;
return 0;
/* bad CRC means corrupted metadata */
if (error == -EFSBADCRC)
return -EFSCORRUPTED;
return error;
}
/*