From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
To: "axboe @ kernel . dk" <axboe@kernel.dk>
Cc: agruenba@redhat.com, cluster-devel@redhat.com,
damien.lemoal@wdc.com, dm-devel@redhat.com, hare@suse.de,
hch@lst.de, jfs-discussion@lists.sourceforge.net, kch@nvidia.com,
linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org, linux-raid@vger.kernel.org,
ming.lei@redhat.com, rpeterso@redhat.com, shaggy@kernel.org,
snitzer@kernel.org, song@kernel.org, willy@infradead.org,
Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH v5 19/20] fs: iomap: use __bio_add_folio where possible
Date: Tue, 2 May 2023 12:19:33 +0200 [thread overview]
Message-ID: <20230502101934.24901-20-johannes.thumshirn@wdc.com> (raw)
In-Reply-To: <20230502101934.24901-1-johannes.thumshirn@wdc.com>
When the iomap buffered-io code can't add a folio to a bio, it allocates a
new bio and adds the folio to that one. This is done using bio_add_folio(),
but doesn't check for errors.
As adding a folio to a newly created bio can't fail, use the newly
introduced __bio_add_folio() function.
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
fs/iomap/buffered-io.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 063133ec77f4..42c5fc0ad329 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -312,7 +312,7 @@ static loff_t iomap_readpage_iter(const struct iomap_iter *iter,
ctx->bio->bi_opf |= REQ_RAHEAD;
ctx->bio->bi_iter.bi_sector = sector;
ctx->bio->bi_end_io = iomap_read_end_io;
- bio_add_folio(ctx->bio, folio, plen, poff);
+ __bio_add_folio(ctx->bio, folio, plen, poff);
}
done:
@@ -539,7 +539,7 @@ static int iomap_read_folio_sync(loff_t block_start, struct folio *folio,
bio_init(&bio, iomap->bdev, &bvec, 1, REQ_OP_READ);
bio.bi_iter.bi_sector = iomap_sector(iomap, block_start);
- bio_add_folio(&bio, folio, plen, poff);
+ __bio_add_folio(&bio, folio, plen, poff);
return submit_bio_wait(&bio);
}
@@ -1582,7 +1582,7 @@ iomap_add_to_ioend(struct inode *inode, loff_t pos, struct folio *folio,
if (!bio_add_folio(wpc->ioend->io_bio, folio, len, poff)) {
wpc->ioend->io_bio = iomap_chain_bio(wpc->ioend->io_bio);
- bio_add_folio(wpc->ioend->io_bio, folio, len, poff);
+ __bio_add_folio(wpc->ioend->io_bio, folio, len, poff);
}
if (iop)
--
2.40.0
next prev parent reply other threads:[~2023-05-02 16:06 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-02 10:19 [PATCH v5 00/20] bio: check return values of bio_add_page Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 01/20] swap: use __bio_add_page to add page to bio Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 02/20] drbd: " Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 03/20] dm: dm-zoned: use __bio_add_page for adding single metadata page Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 04/20] fs: buffer: use __bio_add_page to add single page to bio Johannes Thumshirn
2023-05-30 5:41 ` gouhao
2023-05-30 6:02 ` gouhao
2023-05-02 10:19 ` [PATCH v5 05/20] md: use __bio_add_page to add single page Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 06/20] md: raid5-log: " Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 07/20] md: raid5: use __bio_add_page to add single page to new bio Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 08/20] jfs: logmgr: use __bio_add_page to add single page to bio Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 09/20] gfs2: use __bio_add_page for adding " Johannes Thumshirn
2023-05-02 11:51 ` Bob Peterson
2023-05-02 11:53 ` Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 10/20] zonefs: " Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 11/20] zram: " Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 12/20] floppy: " Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 13/20] md: check for failure when adding pages in alloc_behind_master_bio Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 14/20] md: raid1: use __bio_add_page for adding single page to bio Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 15/20] md: raid1: check if adding pages to resync bio fails Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 16/20] dm-crypt: check if adding pages to clone " Johannes Thumshirn
2023-05-30 15:13 ` [dm-devel] " Mikulas Patocka
2023-05-30 15:49 ` Mike Snitzer
2023-05-30 19:43 ` Mikulas Patocka
2023-05-02 10:19 ` [PATCH v5 17/20] block: mark bio_add_page as __must_check Johannes Thumshirn
2023-05-02 10:19 ` [PATCH v5 18/20] block: add __bio_add_folio Johannes Thumshirn
2023-05-02 10:19 ` Johannes Thumshirn [this message]
2023-05-02 10:19 ` [PATCH v5 20/20] block: mark bio_add_folio as __must_check Johannes Thumshirn
2023-05-05 8:09 ` [PATCH v5 00/20] bio: check return values of bio_add_page Johannes Thumshirn
2023-05-05 14:11 ` Jens Axboe
2023-05-24 10:04 ` Johannes Thumshirn
2023-05-24 15:02 ` Jens Axboe
2023-05-26 6:37 ` Johannes Thumshirn
2023-05-30 15:14 ` Jens Axboe
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=20230502101934.24901-20-johannes.thumshirn@wdc.com \
--to=johannes.thumshirn@wdc.com \
--cc=agruenba@redhat.com \
--cc=axboe@kernel.dk \
--cc=cluster-devel@redhat.com \
--cc=damien.lemoal@wdc.com \
--cc=dm-devel@redhat.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=kch@nvidia.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-raid@vger.kernel.org \
--cc=ming.lei@redhat.com \
--cc=rpeterso@redhat.com \
--cc=shaggy@kernel.org \
--cc=snitzer@kernel.org \
--cc=song@kernel.org \
--cc=willy@infradead.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