| Message ID | 20210722054256.932965-3-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] iomap: simplify iomap_readpage_actor | expand |
On Thu, Jul 22, 2021 at 07:42:56AM +0200, Christoph Hellwig wrote: > Now that the outstanding writes are counted in bytes, there is no need > to use the low-level __bio_try_merge_page API, we can switch back to > always using bio_add_page and simply iomap_add_to_ioend again. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Pretty straightforward. Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > fs/iomap/buffered-io.c | 17 +++++------------ > 1 file changed, 5 insertions(+), 12 deletions(-) > > diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c > index 7898c1c47370e6..d31e0d3b50c683 100644 > --- a/fs/iomap/buffered-io.c > +++ b/fs/iomap/buffered-io.c > @@ -1252,7 +1252,6 @@ iomap_add_to_ioend(struct inode *inode, loff_t offset, struct page *page, > sector_t sector = iomap_sector(&wpc->iomap, offset); > unsigned len = i_blocksize(inode); > unsigned poff = offset & (PAGE_SIZE - 1); > - bool merged, same_page = false; > > if (!wpc->ioend || !iomap_can_add_to_ioend(wpc, offset, sector)) { > if (wpc->ioend) > @@ -1260,19 +1259,13 @@ iomap_add_to_ioend(struct inode *inode, loff_t offset, struct page *page, > wpc->ioend = iomap_alloc_ioend(inode, wpc, offset, sector, wbc); > } > > - merged = __bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, > - &same_page); > - if (iop) > - atomic_add(len, &iop->write_bytes_pending); > - > - if (!merged) { > - if (bio_full(wpc->ioend->io_bio, len)) { > - wpc->ioend->io_bio = > - iomap_chain_bio(wpc->ioend->io_bio); > - } > - bio_add_page(wpc->ioend->io_bio, page, len, poff); > + if (bio_add_page(wpc->ioend->io_bio, page, len, poff) != len) { > + wpc->ioend->io_bio = iomap_chain_bio(wpc->ioend->io_bio); > + __bio_add_page(wpc->ioend->io_bio, page, len, poff); > } > > + if (iop) > + atomic_add(len, &iop->write_bytes_pending); > wpc->ioend->io_size += len; > wbc_account_cgroup_owner(wbc, page, len); > } > -- > 2.30.2 >
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c index 7898c1c47370e6..d31e0d3b50c683 100644 --- a/fs/iomap/buffered-io.c +++ b/fs/iomap/buffered-io.c @@ -1252,7 +1252,6 @@ iomap_add_to_ioend(struct inode *inode, loff_t offset, struct page *page, sector_t sector = iomap_sector(&wpc->iomap, offset); unsigned len = i_blocksize(inode); unsigned poff = offset & (PAGE_SIZE - 1); - bool merged, same_page = false; if (!wpc->ioend || !iomap_can_add_to_ioend(wpc, offset, sector)) { if (wpc->ioend) @@ -1260,19 +1259,13 @@ iomap_add_to_ioend(struct inode *inode, loff_t offset, struct page *page, wpc->ioend = iomap_alloc_ioend(inode, wpc, offset, sector, wbc); } - merged = __bio_try_merge_page(wpc->ioend->io_bio, page, len, poff, - &same_page); - if (iop) - atomic_add(len, &iop->write_bytes_pending); - - if (!merged) { - if (bio_full(wpc->ioend->io_bio, len)) { - wpc->ioend->io_bio = - iomap_chain_bio(wpc->ioend->io_bio); - } - bio_add_page(wpc->ioend->io_bio, page, len, poff); + if (bio_add_page(wpc->ioend->io_bio, page, len, poff) != len) { + wpc->ioend->io_bio = iomap_chain_bio(wpc->ioend->io_bio); + __bio_add_page(wpc->ioend->io_bio, page, len, poff); } + if (iop) + atomic_add(len, &iop->write_bytes_pending); wpc->ioend->io_size += len; wbc_account_cgroup_owner(wbc, page, len); }
Now that the outstanding writes are counted in bytes, there is no need to use the low-level __bio_try_merge_page API, we can switch back to always using bio_add_page and simply iomap_add_to_ioend again. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/iomap/buffered-io.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)