diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-09-01 20:55:46 +0300 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2020-09-16 06:52:39 +0300 |
| commit | 22c10589a10baea8e4695fcf38437b89a41e70a1 (patch) | |
| tree | 310ea698e823a12a677bf4054543f66db6d76cc0 /fs/xfs/xfs_buf.c | |
| parent | 55b7d7115fcd903a3901b2999a2e15e2c9c4f6e0 (diff) | |
| download | linux-22c10589a10baea8e4695fcf38437b89a41e70a1.tar.xz | |
xfs: remove xlog_recover_iodone
The log recovery I/O completion handler does not substancially differ from
the normal one except for the fact that it:
a) never retries failed writes
b) can have log items that aren't on the AIL
c) never has inode/dquot log items attached and thus don't need to
handle them
Add conditionals for (a) and (b) to the ioend code, while (c) doesn't
need special handling anyway.
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>
Diffstat (limited to 'fs/xfs/xfs_buf.c')
| -rw-r--r-- | fs/xfs/xfs_buf.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index 24cc0c94b5b8..7f8abcbe98a4 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c @@ -1244,6 +1244,15 @@ xfs_buf_ioend_handle_error( xfs_buf_ioerror_alert_ratelimited(bp); /* + * We're not going to bother about retrying this during recovery. + * One strike! + */ + if (bp->b_flags & _XBF_LOGRECOVERY) { + xfs_force_shutdown(mp, SHUTDOWN_META_IO_ERROR); + return false; + } + + /* * Synchronous writes will have callers process the error. */ if (!(bp->b_flags & XBF_ASYNC)) @@ -1312,13 +1321,6 @@ xfs_buf_ioend( bp->b_ops->verify_read(bp); if (!bp->b_error) bp->b_flags |= XBF_DONE; - } 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); } else { if (!bp->b_error) { bp->b_flags &= ~XBF_WRITE_FAIL; @@ -1345,9 +1347,11 @@ xfs_buf_ioend( xfs_buf_inode_iodone(bp); else if (bp->b_flags & _XBF_DQUOTS) xfs_buf_dquot_iodone(bp); + } - bp->b_flags &= ~(XBF_READ | XBF_WRITE | XBF_READ_AHEAD); + bp->b_flags &= ~(XBF_READ | XBF_WRITE | XBF_READ_AHEAD | + _XBF_LOGRECOVERY); if (bp->b_flags & XBF_ASYNC) xfs_buf_relse(bp); |