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 02/12] xfs: make xfs_buf_read return an error code
Date: Thu, 23 Jan 2020 16:16:58 -0800 [thread overview]
Message-ID: <20200124001658.GX8247@magnolia> (raw)
In-Reply-To: <20200123222015.GA15904@infradead.org>
On Thu, Jan 23, 2020 at 02:20:15PM -0800, Christoph Hellwig wrote:
> On Wed, Jan 22, 2020 at 11:42:03PM -0800, Darrick J. Wong wrote:
> > - return -ENOMEM;
> > + error = xfs_buf_read(mp->m_ddev_targp, dblkno, dblkcnt,
> > + 0, &bp, &xfs_attr3_rmt_buf_ops);
> > + if (error)
> > + return error;
> > error = bp->b_error;
> > if (error) {
> > xfs_buf_ioerror_alert(bp, __func__);
>
> This still has the bogus b_error check where it should just check the
> error and report it based on the return value.
Yes, because at this point midway through the series xfs_buf_read only
knows how to return -ENOMEM. I'm changing the *interfaces* here, saving
most of the behavior changes for the xfs_buf_read_map change...
> > diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
> > index 56e081dd1d96..fb60c36a8a5b 100644
> > --- a/fs/xfs/xfs_buf.h
> > +++ b/fs/xfs/xfs_buf.h
> > @@ -213,16 +213,25 @@ xfs_buf_get(
> > return xfs_buf_get_map(target, &map, 1, 0);
> > }
> >
> > -static inline struct xfs_buf *
> > +static inline int
> > xfs_buf_read(
> > struct xfs_buftarg *target,
> > xfs_daddr_t blkno,
> > size_t numblks,
> > xfs_buf_flags_t flags,
> > + struct xfs_buf **bpp,
> > const struct xfs_buf_ops *ops)
> > {
> > + struct xfs_buf *bp;
> > DEFINE_SINGLE_BUF_MAP(map, blkno, numblks);
> > - return xfs_buf_read_map(target, &map, 1, flags, ops);
> > +
> > + *bpp = NULL;
> > + bp = xfs_buf_read_map(target, &map, 1, flags, ops);
> > + if (!bp)
> > + return -ENOMEM;
> > +
> > + *bpp = bp;
...because otherwise I end having to migrate all the bp->b_error
checking into this static inline function, which causes compile errors.
I could work around /that/ by moving the xfs_buf_read_map conversion
earlier in the series, but I'd have to rebase the whole series to
achieve the same end result, which seems pointless.
But I guess I could go mess around with it and see just how much of a
pain doing that /actually/ is...
--D
> > + return 0;
> > }
> >
> > static inline void
> > diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> > index 0d683fb96396..b29806846916 100644
> > --- a/fs/xfs/xfs_log_recover.c
> > +++ b/fs/xfs/xfs_log_recover.c
> > @@ -2745,10 +2745,10 @@ xlog_recover_buffer_pass2(
> > if (buf_f->blf_flags & XFS_BLF_INODE_BUF)
> > buf_flags |= XBF_UNMAPPED;
> >
> > - bp = xfs_buf_read(mp->m_ddev_targp, buf_f->blf_blkno, buf_f->blf_len,
> > - buf_flags, NULL);
> > - if (!bp)
> > - return -ENOMEM;
> > + error = xfs_buf_read(mp->m_ddev_targp, buf_f->blf_blkno, buf_f->blf_len,
> > + buf_flags, &bp, NULL);
> > + if (error)
> > + return error;
> > error = bp->b_error;
> > if (error) {
>
> .. and same here.
>
next prev parent reply other threads:[~2020-01-24 0:17 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 [this message]
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
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=20200124001658.GX8247@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 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).