From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 05/13] xfs: fold xfs_buf_ioend_finish into xfs_ioend
Date: Tue, 18 Aug 2020 15:40:24 -0700 [thread overview]
Message-ID: <20200818224024.GF6096@magnolia> (raw)
In-Reply-To: <20200709150453.109230-6-hch@lst.de>
On Thu, Jul 09, 2020 at 05:04:45PM +0200, Christoph Hellwig wrote:
> No need to keep a separate helper for this logic.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks ok to me,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_buf.c | 8 +++++---
> fs/xfs/xfs_buf.h | 7 -------
> fs/xfs/xfs_log_recover.c | 1 -
> 3 files changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index 443d11bdfcf502..e6a73e455caa1a 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -1335,7 +1335,6 @@ xfs_buf_ioend(
> bp->b_ops->verify_read(bp);
> if (!bp->b_error)
> bp->b_flags |= XBF_DONE;
> - xfs_buf_ioend_finish(bp);
> } else if (bp->b_flags & _XBF_LOGRECOVERY) {
> /*
> * If this is a log recovery buffer, we aren't doing
> @@ -1383,9 +1382,12 @@ xfs_buf_ioend(
> xfs_buf_inode_iodone(bp);
> else if (bp->b_flags & _XBF_DQUOTS)
> xfs_buf_dquot_iodone(bp);
> -
> - xfs_buf_ioend_finish(bp);
> }
> +
> + if (bp->b_flags & XBF_ASYNC)
> + xfs_buf_relse(bp);
> + else
> + complete(&bp->b_iowait);
> }
>
> static void
> diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
> index bea20d43a38191..9eb4044597c985 100644
> --- a/fs/xfs/xfs_buf.h
> +++ b/fs/xfs/xfs_buf.h
> @@ -269,13 +269,6 @@ static inline void xfs_buf_relse(xfs_buf_t *bp)
>
> /* Buffer Read and Write Routines */
> extern int xfs_bwrite(struct xfs_buf *bp);
> -static inline void xfs_buf_ioend_finish(struct xfs_buf *bp)
> -{
> - if (bp->b_flags & XBF_ASYNC)
> - xfs_buf_relse(bp);
> - else
> - complete(&bp->b_iowait);
> -}
>
> extern void __xfs_buf_ioerror(struct xfs_buf *bp, int error,
> xfs_failaddr_t failaddr);
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index cf6dabb98f2327..741a2c247bc585 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -288,7 +288,6 @@ xlog_recover_iodone(
> xfs_buf_item_relse(bp);
> ASSERT(bp->b_log_item == NULL);
> bp->b_flags &= ~_XBF_LOGRECOVERY;
> - xfs_buf_ioend_finish(bp);
> }
>
> /*
> --
> 2.26.2
>
next prev parent reply other threads:[~2020-08-18 22:40 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 15:04 tidy up the buffer cache implementation Christoph Hellwig
2020-07-09 15:04 ` [PATCH 01/13] xfs: refactor the buf ioend disposition code Christoph Hellwig
2020-08-18 22:09 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 02/13] xfs: mark xfs_buf_ioend static Christoph Hellwig
2020-08-18 22:10 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 03/13] xfs: refactor xfs_buf_ioend Christoph Hellwig
2020-08-18 22:31 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 04/13] xfs: move the buffer retry logic to xfs_buf.c Christoph Hellwig
2020-08-18 22:39 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 05/13] xfs: fold xfs_buf_ioend_finish into xfs_ioend Christoph Hellwig
2020-08-18 22:40 ` Darrick J. Wong [this message]
2020-07-09 15:04 ` [PATCH 06/13] xfs: refactor xfs_buf_ioerror_fail_without_retry Christoph Hellwig
2020-08-18 22:41 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 07/13] xfs: remove xfs_buf_ioerror_retry Christoph Hellwig
2020-08-18 22:42 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 08/13] xfs: lift the XBF_IOEND_FAIL handling into xfs_buf_ioend_disposition Christoph Hellwig
2020-08-18 22:48 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 09/13] xfs: simplify the xfs_buf_ioend_disposition calling convention Christoph Hellwig
2020-08-18 22:52 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 10/13] xfs: use xfs_buf_item_relse in xfs_buf_item_done Christoph Hellwig
2020-08-18 22:52 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 11/13] xfs: clear the read/write flags later in xfs_buf_ioend Christoph Hellwig
2020-08-18 22:54 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 12/13] xfs: remove xlog_recover_iodone Christoph Hellwig
2020-08-18 22:54 ` Darrick J. Wong
2020-07-09 15:04 ` [PATCH 13/13] xfs: reuse _xfs_buf_read for re-reading the superblock Christoph Hellwig
2020-08-18 23:02 ` Darrick J. Wong
2020-08-29 6:47 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2020-08-30 6:14 tidy up the buffer cache implementation v2 Christoph Hellwig
2020-08-30 6:15 ` [PATCH 05/13] xfs: fold xfs_buf_ioend_finish into xfs_ioend 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=20200818224024.GF6096@magnolia \
--to=darrick.wong@oracle.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;
as well as URLs for NNTP newsgroup(s).