From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Carlos Maiolino <cem@kernel.org>,
linux-xfs@vger.kernel.org, Carlos Maiolino <cmaiolino@redhat.com>
Subject: Re: [PATCH 4/6] xfs: remove xfs_buf_ioend
Date: Thu, 25 Jun 2026 11:09:03 -0700 [thread overview]
Message-ID: <20260625180903.GI6078@frogsfrogsfrogs> (raw)
In-Reply-To: <20260625135849.2494779-5-hch@lst.de>
On Thu, Jun 25, 2026 at 03:58:34PM +0200, Christoph Hellwig wrote:
> There are two callers of xfs_buf_ioend, one of which always has the
> XBF_ASYNC flag set. Open code the logic in both callers to prepare for a
> bug fix.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Seems fine to me,
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
--D
> ---
> fs/xfs/xfs_buf.c | 22 ++++++++--------------
> 1 file changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index 83c74b5b7e8e..3eea9d9ea829 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -1146,18 +1146,6 @@ __xfs_buf_ioend(
> return true;
> }
>
> -static void
> -xfs_buf_ioend(
> - struct xfs_buf *bp)
> -{
> - if (!__xfs_buf_ioend(bp))
> - return;
> - if (bp->b_flags & XBF_ASYNC)
> - xfs_buf_relse(bp);
> - else
> - complete(&bp->b_iowait);
> -}
> -
> static void
> xfs_buf_ioend_work(
> struct work_struct *work)
> @@ -1207,7 +1195,8 @@ xfs_buf_fail(
> bp->b_flags &= ~XBF_DONE;
> xfs_buf_stale(bp);
> xfs_buf_ioerror(bp, -EIO);
> - xfs_buf_ioend(bp);
> + if (__xfs_buf_ioend(bp))
> + xfs_buf_relse(bp);
> }
>
> int
> @@ -1414,7 +1403,12 @@ xfs_buf_submit(
> bp->b_flags &= ~XBF_DONE;
> xfs_buf_stale(bp);
> end_io:
> - xfs_buf_ioend(bp);
> + if (!__xfs_buf_ioend(bp))
> + return;
> + if (bp->b_flags & XBF_ASYNC)
> + xfs_buf_relse(bp);
> + else
> + complete(&bp->b_iowait);
> }
>
> /*
> --
> 2.53.0
>
>
next prev parent reply other threads:[~2026-06-25 18:09 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-25 13:58 xfs_buf_submit error handling fix v2 Christoph Hellwig
2026-06-25 13:58 ` [PATCH 1/6] xfs: open code xfs_buf_ioend_fail in xfs_buf_submit Christoph Hellwig
2026-06-25 13:58 ` [PATCH 2/6] xfs: also mark the buffer stale on verifier failure " Christoph Hellwig
2026-06-25 18:00 ` Darrick J. Wong
2026-06-26 4:35 ` Christoph Hellwig
2026-06-26 6:21 ` Darrick J. Wong
2026-06-26 6:23 ` Christoph Hellwig
2026-06-26 14:47 ` Darrick J. Wong
2026-06-25 13:58 ` [PATCH 3/6] xfs: improve the xfs_buf_ioend_fail calling convention Christoph Hellwig
2026-06-25 18:04 ` Darrick J. Wong
2026-06-25 13:58 ` [PATCH 4/6] xfs: remove xfs_buf_ioend Christoph Hellwig
2026-06-25 18:09 ` Darrick J. Wong [this message]
2026-06-25 13:58 ` [PATCH 5/6] xfs: fix handling of synchronous errors in xfs_buf_submit Christoph Hellwig
2026-06-25 18:13 ` Darrick J. Wong
2026-06-26 4:36 ` Christoph Hellwig
2026-06-25 13:58 ` [PATCH 6/6] xfs: simplify __xfs_buf_ioend Christoph Hellwig
2026-06-25 18:30 ` Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2026-06-22 7:29 xfs_buf_submit error handling fix Christoph Hellwig
2026-06-22 7:30 ` [PATCH 4/6] xfs: remove xfs_buf_ioend Christoph Hellwig
2026-06-22 13:17 ` Carlos Maiolino
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=20260625180903.GI6078@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=cem@kernel.org \
--cc=cmaiolino@redhat.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