From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 07/13] xfs: remove xfs_buf_ioerror_retry
Date: Tue, 18 Aug 2020 15:42:47 -0700 [thread overview]
Message-ID: <20200818224247.GH6096@magnolia> (raw)
In-Reply-To: <20200709150453.109230-8-hch@lst.de>
On Thu, Jul 09, 2020 at 05:04:47PM +0200, Christoph Hellwig wrote:
> Merge xfs_buf_ioerror_retry into its only caller to make the resubmission
> flow a little more obvious.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Not sure about obvious, but at least it's all together again... :)
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_buf.c | 33 ++++++++++++---------------------
> 1 file changed, 12 insertions(+), 21 deletions(-)
>
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index 2f2ce3faab0826..e5592563dda6a1 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -1187,23 +1187,6 @@ xfs_buf_ioerror_alert_ratelimited(
> lasttarg = bp->b_target;
> }
>
> -static bool
> -xfs_buf_ioerror_retry(
> - struct xfs_buf *bp,
> - struct xfs_error_cfg *cfg)
> -{
> - if ((bp->b_flags & (XBF_STALE | XBF_WRITE_FAIL)) &&
> - bp->b_last_error == bp->b_error)
> - return false;
> -
> - bp->b_flags |= (XBF_WRITE | XBF_DONE | XBF_WRITE_FAIL);
> - bp->b_last_error = bp->b_error;
> - if (cfg->retry_timeout != XFS_ERR_RETRY_FOREVER &&
> - !bp->b_first_retry_time)
> - bp->b_first_retry_time = jiffies;
> - return true;
> -}
> -
> /*
> * Account for this latest trip around the retry handler, and decide if
> * we've failed enough times to constitute a permanent failure.
> @@ -1283,10 +1266,13 @@ xfs_buf_ioend_disposition(
> trace_xfs_buf_iodone_async(bp, _RET_IP_);
>
> cfg = xfs_error_get_cfg(mp, XFS_ERR_METADATA, bp->b_error);
> - if (xfs_buf_ioerror_retry(bp, cfg)) {
> - xfs_buf_ioerror(bp, 0);
> - xfs_buf_submit(bp);
> - return XBF_IOEND_DONE;
> + if (bp->b_last_error != bp->b_error ||
> + !(bp->b_flags & (XBF_STALE | XBF_WRITE_FAIL))) {
> + bp->b_last_error = bp->b_error;
> + if (cfg->retry_timeout != XFS_ERR_RETRY_FOREVER &&
> + !bp->b_first_retry_time)
> + bp->b_first_retry_time = jiffies;
> + goto resubmit;
> }
>
> /*
> @@ -1301,6 +1287,11 @@ xfs_buf_ioend_disposition(
> /* Still considered a transient error. Caller will schedule retries. */
> return XBF_IOEND_FAIL;
>
> +resubmit:
> + xfs_buf_ioerror(bp, 0);
> + bp->b_flags |= (XBF_WRITE | XBF_DONE | XBF_WRITE_FAIL);
> + xfs_buf_submit(bp);
> + return XBF_IOEND_DONE;
> out_stale:
> xfs_buf_stale(bp);
> bp->b_flags |= XBF_DONE;
> --
> 2.26.2
>
next prev parent reply other threads:[~2020-08-18 22:42 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 ` [PATCH 03/13] xfs: refactor xfs_buf_ioend Christoph Hellwig
2020-08-18 22:31 ` 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 [this message]
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
-- strict thread matches above, loose matches on Subject: below --
2020-08-30 6:14 tidy up the buffer cache implementation v2 Christoph Hellwig
2020-08-30 6:15 ` [PATCH 07/13] xfs: remove xfs_buf_ioerror_retry 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=20200818224247.GH6096@magnolia \
--to=darrick.wong@oracle.com \
--cc=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).