From: Dave Chinner <david@fromorbit.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org, hch@infradead.org
Subject: Re: [PATCH 05/12] xfs: make xfs_buf_read_map return an error code
Date: Fri, 24 Jan 2020 12:31:52 +1100 [thread overview]
Message-ID: <20200124013152.GF7090@dread.disaster.area> (raw)
In-Reply-To: <157976534245.2388944.13378396804109422541.stgit@magnolia>
On Wed, Jan 22, 2020 at 11:42:22PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Convert xfs_buf_read_map() to return numeric error codes like most
> everywhere else in xfs. This involves moving the open-coded logic that
> reports metadata IO read / corruption errors and stales the buffer into
> xfs_buf_read_map so that the logic is all in one place.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
.....
> diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c
> index b5b3a78ef31c..56e7f8126cd7 100644
> --- a/fs/xfs/xfs_trans_buf.c
> +++ b/fs/xfs/xfs_trans_buf.c
> @@ -298,36 +298,17 @@ xfs_trans_read_buf_map(
> return 0;
> }
>
> - bp = xfs_buf_read_map(target, map, nmaps, flags, ops);
> - if (!bp) {
> - if (!(flags & XBF_TRYLOCK))
> - return -ENOMEM;
> - return tp ? 0 : -EAGAIN;
> - }
> -
> - /*
> - * 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
> - * to pull the buffer from disk again, we clear the XBF_DONE flag and
> - * mark the buffer stale. This ensures that anyone who has a current
> - * reference to the buffer will interpret it's contents correctly and
> - * future cache lookups will also treat it as an empty, uninitialised
> - * buffer.
> - */
> - if (bp->b_error) {
> - error = bp->b_error;
> - if (!XFS_FORCED_SHUTDOWN(mp))
> - xfs_buf_ioerror_alert(bp, __func__);
> - bp->b_flags &= ~XBF_DONE;
> - xfs_buf_stale(bp);
> -
> + error = xfs_buf_read_map(target, map, nmaps, flags, &bp, ops);
> + switch (error) {
> + case 0:
> + break;
> + case -EFSCORRUPTED:
> + case -EIO:
> if (tp && (tp->t_flags & XFS_TRANS_DIRTY))
> - xfs_force_shutdown(tp->t_mountp, SHUTDOWN_META_IO_ERROR);
> - xfs_buf_relse(bp);
> -
> - /* bad CRC means corrupted metadata */
> - if (error == -EFSBADCRC)
> - error = -EFSCORRUPTED;
> + xfs_force_shutdown(tp->t_mountp,
> + SHUTDOWN_META_IO_ERROR);
> + /* fall through */
> + default:
> return error;
> }
Same question as Christoph - we're only trying to avoid ENOMEM and
EAGAIN errors from shutting down the filesystem here, right?
Every other type of IO error that could end up on bp->b_error would
result in a shutdown, so perhaps this should be the other way
around:
switch (error) {
case 0:
break;
default:
/* shutdown stuff */
/* fall through */
case -ENOMEM:
case -EAGAIN:
return error;
}
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
next prev parent reply other threads:[~2020-01-24 1:31 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-23 7:41 [PATCH v4 00/12] xfs: make buffer functions return error codes Darrick J. Wong
2020-01-23 7:41 ` [PATCH 01/12] xfs: make xfs_buf_alloc return an error code Darrick J. Wong
2020-01-24 0:47 ` Dave Chinner
2020-01-23 7:42 ` [PATCH 02/12] xfs: make xfs_buf_read " Darrick J. Wong
2020-01-23 22:20 ` Christoph Hellwig
2020-01-24 0:16 ` Darrick J. Wong
2020-01-24 1:08 ` Darrick J. Wong
2020-01-24 0:49 ` Dave Chinner
2020-01-23 7:42 ` [PATCH 03/12] xfs: make xfs_buf_get " Darrick J. Wong
2020-01-24 0:50 ` Dave Chinner
2020-01-23 7:42 ` [PATCH 04/12] xfs: make xfs_buf_get_uncached " Darrick J. Wong
2020-01-24 0:53 ` Dave Chinner
2020-01-23 7:42 ` [PATCH 05/12] xfs: make xfs_buf_read_map " Darrick J. Wong
2020-01-23 22:24 ` Christoph Hellwig
2020-01-24 0:23 ` Darrick J. Wong
2020-01-24 4:59 ` Darrick J. Wong
2020-01-24 1:31 ` Dave Chinner [this message]
2020-01-24 4:34 ` Darrick J. Wong
2020-01-23 7:42 ` [PATCH 06/12] xfs: make xfs_buf_get_map " Darrick J. Wong
2020-01-24 1:41 ` Dave Chinner
2020-01-23 7:42 ` [PATCH 07/12] xfs: make xfs_trans_get_buf_map " Darrick J. Wong
2020-01-24 1:44 ` Dave Chinner
2020-01-23 7:42 ` [PATCH 08/12] xfs: make xfs_trans_get_buf " Darrick J. Wong
2020-01-24 1:48 ` Dave Chinner
2020-01-23 7:42 ` [PATCH 09/12] xfs: remove the xfs_btree_get_buf[ls] functions Darrick J. Wong
2020-01-24 1:50 ` Dave Chinner
2020-01-23 7:42 ` [PATCH 10/12] xfs: make xfs_*read_agf return EAGAIN to ALLOC_FLAG_TRYLOCK callers Darrick J. Wong
2020-01-24 2:00 ` Dave Chinner
2020-01-24 4:47 ` Darrick J. Wong
2020-01-23 7:43 ` [PATCH 11/12] xfs: remove unnecessary null pointer checks from _read_agf callers Darrick J. Wong
2020-01-24 2:01 ` Dave Chinner
2020-01-23 7:43 ` [PATCH 12/12] xfs: fix xfs_buf_ioerror_alert location reporting Darrick J. Wong
2020-01-24 2:07 ` Dave Chinner
2020-01-24 4:21 ` Darrick J. Wong
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=20200124013152.GF7090@dread.disaster.area \
--to=david@fromorbit.com \
--cc=darrick.wong@oracle.com \
--cc=hch@infradead.org \
--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).