From: Christoph Hellwig <hch@infradead.org>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org, hch@infradead.org
Subject: Re: [PATCH 05/11] xfs: make xfs_buf_read_map return an error code
Date: Thu, 16 Jan 2020 22:50:20 -0800 [thread overview]
Message-ID: <20200117065020.GA26438@infradead.org> (raw)
In-Reply-To: <157924224846.3029431.3421957295562306193.stgit@magnolia>
> @@ -842,13 +845,15 @@ xfs_buf_read_map(
> * drop the buffer
> */
> xfs_buf_relse(bp);
> - return NULL;
> + *bpp = NULL;
We already set *bpp to NULL at the very beginning, so this line is
redundant.
> @@ -860,19 +865,18 @@ xfs_buf_read(
> struct xfs_buf **bpp,
> const struct xfs_buf_ops *ops)
> {
> int error;
> DEFINE_SINGLE_BUF_MAP(map, blkno, numblks);
>
> - *bpp = NULL;
> - bp = xfs_buf_read_map(target, &map, 1, flags, ops);
> - if (!bp)
> - return -ENOMEM;
> - error = bp->b_error;
> + error = xfs_buf_read_map(target, &map, 1, flags, bpp, ops);
> + if (error)
> + return error;
> + error = (*bpp)->b_error;
> if (error) {
> + xfs_buf_ioerror_alert(*bpp, __func__);
> + xfs_buf_stale(*bpp);
> + xfs_buf_relse(*bpp);
> + *bpp = NULL;
>
> /* bad CRC means corrupted metadata */
> if (error == -EFSBADCRC)
I still think we have a problem here. We should not have to check
->b_error, and the xfs_buf_ioerror_alert should be either in the callers
or in xfs_buf_read_map, as xfs_buf_read is just supposed to be a trivial
wrapper for the single map case, not add functionality of its own.
next prev parent reply other threads:[~2020-01-17 6:50 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-17 6:23 [PATCH v2 00/11] xfs: make buffer functions return error codes Darrick J. Wong
2020-01-17 6:23 ` [PATCH 01/11] xfs: make xfs_buf_alloc return an error code Darrick J. Wong
2020-01-19 21:49 ` Dave Chinner
2020-01-20 22:19 ` Darrick J. Wong
2020-01-17 6:23 ` [PATCH 02/11] xfs: make xfs_buf_read " Darrick J. Wong
2020-01-19 21:57 ` Dave Chinner
2020-01-20 22:22 ` Darrick J. Wong
2020-01-17 6:23 ` [PATCH 03/11] xfs: make xfs_buf_get " Darrick J. Wong
2020-01-19 21:59 ` Dave Chinner
2020-01-17 6:24 ` [PATCH 04/11] xfs: make xfs_buf_get_uncached " Darrick J. Wong
2020-01-17 6:24 ` [PATCH 05/11] xfs: make xfs_buf_read_map " Darrick J. Wong
2020-01-17 6:50 ` Christoph Hellwig [this message]
2020-01-17 22:58 ` Darrick J. Wong
2020-01-17 6:24 ` [PATCH 06/11] xfs: make xfs_buf_get_map " Darrick J. Wong
2020-01-17 6:24 ` [PATCH 07/11] xfs: make xfs_trans_get_buf_map " Darrick J. Wong
2020-01-17 6:24 ` [PATCH 08/11] xfs: make xfs_trans_get_buf " Darrick J. Wong
2020-01-17 6:24 ` [PATCH 09/11] xfs: remove the xfs_btree_get_buf[ls] functions Darrick J. Wong
2020-01-17 6:51 ` Christoph Hellwig
2020-01-17 6:24 ` [PATCH 10/11] xfs: make xfs_*read_agf return EAGAIN to ALLOC_FLAG_TRYLOCK callers Darrick J. Wong
2020-01-17 6:59 ` Christoph Hellwig
2020-01-17 23:05 ` Darrick J. Wong
2020-01-17 6:24 ` [PATCH 11/11] xfs: remove unnecessary null pointer checks from _read_agf callers Darrick J. Wong
2020-01-17 7:00 ` 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=20200117065020.GA26438@infradead.org \
--to=hch@infradead.org \
--cc=darrick.wong@oracle.com \
--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