From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Damien Le Moal <Damien.LeMoal@wdc.com>,
Andreas Gruenbacher <agruenba@redhat.com>,
linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 02/12] xfs: simplify xfs_chain_bio
Date: Mon, 24 Jun 2019 08:14:58 -0700 [thread overview]
Message-ID: <20190624151458.GI5387@magnolia> (raw)
In-Reply-To: <20190624055253.31183-3-hch@lst.de>
On Mon, Jun 24, 2019 at 07:52:43AM +0200, Christoph Hellwig wrote:
> Move setting up operation and write hint to xfs_alloc_ioend, and
> then just copy over all needed information from the previous bio
> in xfs_chain_bio and stop passing various parameters to it.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
I always thought it was a little odd that we were still setting bio
fields in the submission function...
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_aops.c | 35 +++++++++++++++++------------------
> 1 file changed, 17 insertions(+), 18 deletions(-)
>
> diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
> index a6f0f4761a37..9cceb90e77c5 100644
> --- a/fs/xfs/xfs_aops.c
> +++ b/fs/xfs/xfs_aops.c
> @@ -665,7 +665,6 @@ xfs_submit_ioend(
>
> ioend->io_bio->bi_private = ioend;
> ioend->io_bio->bi_end_io = xfs_end_bio;
> - ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
>
> /*
> * If we are failing the IO now, just mark the ioend with an
> @@ -679,7 +678,6 @@ xfs_submit_ioend(
> return status;
> }
>
> - ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;
> submit_bio(ioend->io_bio);
> return 0;
> }
> @@ -691,7 +689,8 @@ xfs_alloc_ioend(
> xfs_exntst_t state,
> xfs_off_t offset,
> struct block_device *bdev,
> - sector_t sector)
> + sector_t sector,
> + struct writeback_control *wbc)
> {
> struct xfs_ioend *ioend;
> struct bio *bio;
> @@ -699,6 +698,8 @@ xfs_alloc_ioend(
> bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, &xfs_ioend_bioset);
> bio_set_dev(bio, bdev);
> bio->bi_iter.bi_sector = sector;
> + bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
> + bio->bi_write_hint = inode->i_write_hint;
>
> ioend = container_of(bio, struct xfs_ioend, io_inline_bio);
> INIT_LIST_HEAD(&ioend->io_list);
> @@ -719,24 +720,22 @@ xfs_alloc_ioend(
> * so that the bi_private linkage is set up in the right direction for the
> * traversal in xfs_destroy_ioend().
> */
> -static void
> +static struct bio *
> xfs_chain_bio(
> - struct xfs_ioend *ioend,
> - struct writeback_control *wbc,
> - struct block_device *bdev,
> - sector_t sector)
> + struct bio *prev)
> {
> struct bio *new;
>
> new = bio_alloc(GFP_NOFS, BIO_MAX_PAGES);
> - bio_set_dev(new, bdev);
> - new->bi_iter.bi_sector = sector;
> - bio_chain(ioend->io_bio, new);
> - bio_get(ioend->io_bio); /* for xfs_destroy_ioend */
> - ioend->io_bio->bi_opf = REQ_OP_WRITE | wbc_to_write_flags(wbc);
> - ioend->io_bio->bi_write_hint = ioend->io_inode->i_write_hint;
> - submit_bio(ioend->io_bio);
> - ioend->io_bio = new;
> + bio_copy_dev(new, prev);
> + new->bi_iter.bi_sector = bio_end_sector(prev);
> + new->bi_opf = prev->bi_opf;
> + new->bi_write_hint = prev->bi_write_hint;
> +
> + bio_chain(prev, new);
> + bio_get(prev); /* for xfs_destroy_ioend */
> + submit_bio(prev);
> + return new;
> }
>
> /*
> @@ -771,14 +770,14 @@ xfs_add_to_ioend(
> if (wpc->ioend)
> list_add(&wpc->ioend->io_list, iolist);
> wpc->ioend = xfs_alloc_ioend(inode, wpc->fork,
> - wpc->imap.br_state, offset, bdev, sector);
> + wpc->imap.br_state, offset, bdev, sector, wbc);
> }
>
> if (!__bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, true)) {
> if (iop)
> atomic_inc(&iop->write_count);
> if (bio_full(wpc->ioend->io_bio))
> - xfs_chain_bio(wpc->ioend, wbc, bdev, sector);
> + wpc->ioend->io_bio = xfs_chain_bio(wpc->ioend->io_bio);
> bio_add_page(wpc->ioend->io_bio, page, len, poff);
> }
>
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-06-24 15:15 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 5:52 lift the xfs writepage code into iomap Christoph Hellwig
2019-06-24 5:52 ` [PATCH 01/12] list.h: add a list_pop helper Christoph Hellwig
2019-06-24 14:53 ` Darrick J. Wong
2019-06-24 15:51 ` Matthew Wilcox
2019-06-25 10:06 ` Christoph Hellwig
2019-06-24 5:52 ` [PATCH 02/12] xfs: simplify xfs_chain_bio Christoph Hellwig
2019-06-24 15:14 ` Darrick J. Wong [this message]
2019-06-24 5:52 ` [PATCH 03/12] xfs: fix a comment typo in xfs_submit_ioend Christoph Hellwig
2019-06-24 14:53 ` Darrick J. Wong
2019-06-24 5:52 ` [PATCH 04/12] xfs: initialize ioma->flags in xfs_bmbt_to_iomap Christoph Hellwig
2019-06-24 14:57 ` Darrick J. Wong
2019-06-25 10:07 ` Christoph Hellwig
2019-06-25 15:13 ` Darrick J. Wong
2019-06-25 15:21 ` Christoph Hellwig
2019-06-24 5:52 ` [PATCH 05/12] xfs: use a struct iomap in xfs_writepage_ctx Christoph Hellwig
2019-06-24 15:50 ` Darrick J. Wong
2019-06-24 5:52 ` [PATCH 06/12] xfs: remove XFS_TRANS_NOFS Christoph Hellwig
2019-06-24 15:58 ` Darrick J. Wong
2019-06-24 22:59 ` Dave Chinner
2019-06-25 10:12 ` Christoph Hellwig
2019-06-24 5:52 ` [PATCH 07/12] xfs: don't preallocate a transaction for file size updates Christoph Hellwig
2019-06-24 16:17 ` Darrick J. Wong
2019-06-24 23:15 ` Dave Chinner
2019-06-25 10:25 ` Christoph Hellwig
2019-06-27 22:23 ` Dave Chinner
2019-06-24 5:52 ` [PATCH 08/12] xfs: simplify xfs_ioend_can_merge Christoph Hellwig
2019-06-24 16:00 ` Darrick J. Wong
2019-06-24 5:52 ` [PATCH 09/12] xfs: refactor the ioend merging code Christoph Hellwig
2019-06-24 16:04 ` Darrick J. Wong
2019-06-24 16:06 ` Nikolay Borisov
2019-06-25 10:14 ` Christoph Hellwig
2019-06-25 12:42 ` Nikolay Borisov
2019-06-25 14:45 ` Darrick J. Wong
2019-06-24 5:52 ` [PATCH 10/12] xfs: remove the fork fields in the writepage_ctx and ioend Christoph Hellwig
2019-06-24 16:08 ` Darrick J. Wong
2019-06-24 5:52 ` [PATCH 11/12] iomap: move the xfs writeback code to iomap.c Christoph Hellwig
2019-06-24 15:46 ` Darrick J. Wong
2019-06-25 10:08 ` Christoph Hellwig
2019-06-24 23:43 ` Dave Chinner
2019-06-25 10:10 ` Christoph Hellwig
2019-06-28 0:45 ` Dave Chinner
2019-06-28 5:33 ` Christoph Hellwig
2019-07-01 0:08 ` Dave Chinner
2019-07-01 6:43 ` Christoph Hellwig
2019-07-01 23:09 ` Dave Chinner
2019-06-28 22:27 ` Luis Chamberlain
2019-07-11 21:31 ` Brendan Higgins
2019-06-24 5:52 ` [PATCH 12/12] iomap: add tracing for the address space operations Christoph Hellwig
2019-06-24 23:49 ` Dave Chinner
2019-06-25 10:15 ` Christoph Hellwig
2019-06-25 14:47 ` Darrick J. Wong
2019-06-27 22:35 ` Dave Chinner
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=20190624151458.GI5387@magnolia \
--to=darrick.wong@oracle.com \
--cc=Damien.LeMoal@wdc.com \
--cc=agruenba@redhat.com \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.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).