From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: linux-xfs@vger.kernel.org, david@fromorbit.com
Subject: Re: [PATCH 05/12] xfs: make xfs_buf_read_map return an error code
Date: Thu, 23 Jan 2020 20:59:42 -0800 [thread overview]
Message-ID: <20200124045942.GE8247@magnolia> (raw)
In-Reply-To: <20200124002321.GY8247@magnolia>
On Thu, Jan 23, 2020 at 04:23:21PM -0800, Darrick J. Wong wrote:
> On Thu, Jan 23, 2020 at 02:24:41PM -0800, Christoph Hellwig wrote:
> > On Wed, Jan 22, 2020 at 11:42:22PM -0800, Darrick J. Wong wrote:
> > > index fc93fd88ec89..df25024275a1 100644
> > > --- a/fs/xfs/libxfs/xfs_alloc.c
> > > +++ b/fs/xfs/libxfs/xfs_alloc.c
> > > @@ -2956,14 +2956,13 @@ xfs_read_agf(
> > > trace_xfs_read_agf(mp, agno);
> > >
> > > ASSERT(agno != NULLAGNUMBER);
> > > - error = xfs_trans_read_buf(
> > > - mp, tp, mp->m_ddev_targp,
> > > + error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp,
> > > XFS_AG_DADDR(mp, agno, XFS_AGF_DADDR(mp)),
> > > XFS_FSS_TO_BB(mp, 1), flags, bpp, &xfs_agf_buf_ops);
> > > + if (error == -EAGAIN)
> > > + return 0;
> > > if (error)
> > > return error;
> > > - if (!*bpp)
> > > - return 0;
> >
> > Shouldn't the change in calling conventions for xfs_trans_read_buf be
> > in another patch dealing just with xfs_trans_read_buf?
>
> Actually ... it really needs to be in the next patch because it's the
> xfs_buf_get_map transition that makes it so that xfs_trans_read_buf can
> return EAGAIN.
Now that I've reshuffled the whole patchset I realize that it more or
less has to be this way because this particular change insulates the
callers of xfs_read_agf() from needing to learn about EAGAIN right now.
I /could/ change all of those callers in this patch instead of handling
it separately in "xfs: make xfs_*read_agf return EAGAIN to
ALLOC_FLAG_TRYLOCK callers", but now the patch would be changing the
behavior of three separate API calls, and I'm trying to avoid
monsters like that.
(Anyway, onward to v5...)
> > > + /* bad CRC means corrupted metadata */
> > > + if (error == -EFSBADCRC)
> > > + error = -EFSCORRUPTED;
> > > + return error;
> >
> > Note that this coukd and should now also go away in the xfs_buf_read()
> > callers, not just the direct xfs_buf_read_map ones.
>
> Huh? This patch /does/ remove the EFSBADCRC->EFSCORRUPTED code in the
> xfs_buf_read callers... <confused>
The reshuffle makes adding this bit unnecessary since I converted
xfs_buf_read_map earlier in the sequence.
> > > + 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);
> > > + /* fall through */
> > > + default:
> >
> > Isn't it really EAGAIN the only special case here? I.e. something
> > more like:
> >
> > if (error && error != -EAGAIN) {
> > if (tp && (tp->t_flags & XFS_TRANS_DIRTY))
> > xfs_force_shutdown(tp->t_mountp,
> > SHUTDOWN_META_IO_ERROR);
> > }
> >
> > return error;
>
> Yes, I think so.
>
> --D
next prev parent reply other threads:[~2020-01-24 4:59 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 [this message]
2020-01-24 1:31 ` Dave Chinner
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=20200124045942.GE8247@magnolia \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.