From: Christoph Hellwig <hch@lst.de>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 03/13] xfs: refactor xfs_buf_ioend
Date: Thu, 9 Jul 2020 17:04:43 +0200 [thread overview]
Message-ID: <20200709150453.109230-4-hch@lst.de> (raw)
In-Reply-To: <20200709150453.109230-1-hch@lst.de>
Refactor the logic for the different I/O completions to prepare for
more code sharing.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/xfs_buf.c | 41 +++++++++++++++++-----------------------
fs/xfs/xfs_log_recover.c | 14 +++++++-------
2 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index 1bce6457a9b943..7c22d63f43f754 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1199,33 +1199,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 52a65a74208ffe..cf6dabb98f2327 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);
}
/*
--
2.26.2
next prev parent reply other threads:[~2020-07-09 15:13 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 15:04 tidy up the buffer cache implementation Christoph Hellwig
2020-07-09 15:04 ` [PATCH 01/13] xfs: refactor the buf ioend disposition code Christoph Hellwig
2020-08-18 22:09 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 02/13] xfs: mark xfs_buf_ioend static Christoph Hellwig
2020-08-18 22:10 ` Darrick J. Wong
2020-07-09 15:04 ` Christoph Hellwig [this message]
2020-08-18 22:31 ` [PATCH 03/13] xfs: refactor xfs_buf_ioend Darrick J. Wong
2020-07-09 15:04 ` [PATCH 04/13] xfs: move the buffer retry logic to xfs_buf.c Christoph Hellwig
2020-08-18 22:39 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 05/13] xfs: fold xfs_buf_ioend_finish into xfs_ioend Christoph Hellwig
2020-08-18 22:40 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 06/13] xfs: refactor xfs_buf_ioerror_fail_without_retry Christoph Hellwig
2020-08-18 22:41 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 07/13] xfs: remove xfs_buf_ioerror_retry Christoph Hellwig
2020-08-18 22:42 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 08/13] xfs: lift the XBF_IOEND_FAIL handling into xfs_buf_ioend_disposition Christoph Hellwig
2020-08-18 22:48 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 09/13] xfs: simplify the xfs_buf_ioend_disposition calling convention Christoph Hellwig
2020-08-18 22:52 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 10/13] xfs: use xfs_buf_item_relse in xfs_buf_item_done Christoph Hellwig
2020-08-18 22:52 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 11/13] xfs: clear the read/write flags later in xfs_buf_ioend Christoph Hellwig
2020-08-18 22:54 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 12/13] xfs: remove xlog_recover_iodone Christoph Hellwig
2020-08-18 22:54 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 13/13] xfs: reuse _xfs_buf_read for re-reading the superblock Christoph Hellwig
2020-08-18 23:02 ` Darrick J. Wong
2020-08-29 6:47 ` Christoph Hellwig
2020-08-30 6:14 tidy up the buffer cache implementation v2 Christoph Hellwig
2020-08-30 6:15 ` [PATCH 03/13] xfs: refactor xfs_buf_ioend Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200709150453.109230-4-hch@lst.de \
--to=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).