summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-09-01 10:55:20 -0700
committerDarrick J. Wong <darrick.wong@oracle.com>2020-09-15 20:52:38 -0700
commit23fb5a93c21f7b2393c216b40afff8027164d8d4 (patch)
treec7211ac3e31476da395e5b8e03745a05209e39ff
parent76b2d323461122f1c00d346166e7180a20cd6dba (diff)
xfs: refactor xfs_buf_ioend
Move the log recovery I/O completion handling entirely into the log recovery code, and re-arrange the normal I/O completion handler flow to prepare to lifting more logic into common code in the next commits. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
-rw-r--r--fs/xfs/xfs_buf.c41
-rw-r--r--fs/xfs/xfs_log_recover.c14
2 files changed, 24 insertions, 31 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 03dd12a83b82..6447cf051e08 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1197,33 +1197,26 @@ xfs_buf_ioend(
if (!bp->b_error)
bp->b_flags |= XBF_DONE;
xfs_buf_ioend_finish(bp);
- return;
- }
-
- if (!bp->b_error) {
- bp->b_flags &= ~XBF_WRITE_FAIL;
- bp->b_flags |= XBF_DONE;
- }
-
- /*
- * If this is a log recovery buffer, we aren't doing transactional IO
- * yet so we need to let it handle IO completions.
- */
- if (bp->b_flags & _XBF_LOGRECOVERY) {
+ } else if (bp->b_flags & _XBF_LOGRECOVERY) {
+ /*
+ * If this is a log recovery buffer, we aren't doing
+ * transactional I/O yet so we need to let the log recovery code
+ * handle I/O completions:
+ */
xlog_recover_iodone(bp);
- return;
- }
-
- if (bp->b_flags & _XBF_INODES) {
- xfs_buf_inode_iodone(bp);
- return;
- }
+ } else {
+ if (!bp->b_error) {
+ bp->b_flags &= ~XBF_WRITE_FAIL;
+ bp->b_flags |= XBF_DONE;
+ }
- if (bp->b_flags & _XBF_DQUOTS) {
- xfs_buf_dquot_iodone(bp);
- return;
+ if (bp->b_flags & _XBF_INODES)
+ xfs_buf_inode_iodone(bp);
+ else if (bp->b_flags & _XBF_DQUOTS)
+ xfs_buf_dquot_iodone(bp);
+ else
+ xfs_buf_iodone(bp);
}
- xfs_buf_iodone(bp);
}
static void
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 45dca18a9520..5b2e5067ab44 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -269,15 +269,15 @@ void
xlog_recover_iodone(
struct xfs_buf *bp)
{
- if (bp->b_error) {
+ if (!bp->b_error) {
+ bp->b_flags |= XBF_DONE;
+ } else if (!XFS_FORCED_SHUTDOWN(bp->b_mount)) {
/*
- * We're not going to bother about retrying
- * this during recovery. One strike!
+ * We're not going to bother about retrying this during
+ * recovery. One strike!
*/
- if (!XFS_FORCED_SHUTDOWN(bp->b_mount)) {
- xfs_buf_ioerror_alert(bp, __this_address);
- xfs_force_shutdown(bp->b_mount, SHUTDOWN_META_IO_ERROR);
- }
+ xfs_buf_ioerror_alert(bp, __this_address);
+ xfs_force_shutdown(bp->b_mount, SHUTDOWN_META_IO_ERROR);
}
/*