]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
dm-integrity: use bio_add_virt_nofail
authorChristoph Hellwig <hch@lst.de>
Wed, 7 May 2025 12:04:38 +0000 (14:04 +0200)
committerJens Axboe <axboe@kernel.dk>
Wed, 7 May 2025 13:31:07 +0000 (07:31 -0600)
Convert the __bio_add_page(..., virt_to_page(), ...) pattern to the
bio_add_virt_nofail helper implementing it, and do the same for the
similar pattern using bio_add_page for adding the first segment after
a bio allocation as that can't fail either.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Mikulas Patocka <mpatocka@redhat.com>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20250507120451.4000627-15-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/md/dm-integrity.c

index 2a283feb3319ca978e403dad572eee5943d1ec1a..9dca9dbabfaa87b404a7be862b2597a3a148dc26 100644 (file)
@@ -2557,14 +2557,8 @@ static void dm_integrity_inline_recheck(struct work_struct *w)
                char *mem;
 
                outgoing_bio = bio_alloc_bioset(ic->dev->bdev, 1, REQ_OP_READ, GFP_NOIO, &ic->recheck_bios);
-
-               r = bio_add_page(outgoing_bio, virt_to_page(outgoing_data), ic->sectors_per_block << SECTOR_SHIFT, 0);
-               if (unlikely(r != (ic->sectors_per_block << SECTOR_SHIFT))) {
-                       bio_put(outgoing_bio);
-                       bio->bi_status = BLK_STS_RESOURCE;
-                       bio_endio(bio);
-                       return;
-               }
+               bio_add_virt_nofail(outgoing_bio, outgoing_data,
+                               ic->sectors_per_block << SECTOR_SHIFT);
 
                bip = bio_integrity_alloc(outgoing_bio, GFP_NOIO, 1);
                if (IS_ERR(bip)) {
@@ -3211,7 +3205,8 @@ next_chunk:
 
        bio = bio_alloc_bioset(ic->dev->bdev, 1, REQ_OP_READ, GFP_NOIO, &ic->recalc_bios);
        bio->bi_iter.bi_sector = ic->start + SB_SECTORS + range.logical_sector;
-       __bio_add_page(bio, virt_to_page(recalc_buffer), range.n_sectors << SECTOR_SHIFT, offset_in_page(recalc_buffer));
+       bio_add_virt_nofail(bio, recalc_buffer,
+                       range.n_sectors << SECTOR_SHIFT);
        r = submit_bio_wait(bio);
        bio_put(bio);
        if (unlikely(r)) {
@@ -3228,7 +3223,8 @@ next_chunk:
 
        bio = bio_alloc_bioset(ic->dev->bdev, 1, REQ_OP_WRITE, GFP_NOIO, &ic->recalc_bios);
        bio->bi_iter.bi_sector = ic->start + SB_SECTORS + range.logical_sector;
-       __bio_add_page(bio, virt_to_page(recalc_buffer), range.n_sectors << SECTOR_SHIFT, offset_in_page(recalc_buffer));
+       bio_add_virt_nofail(bio, recalc_buffer,
+                       range.n_sectors << SECTOR_SHIFT);
 
        bip = bio_integrity_alloc(bio, GFP_NOIO, 1);
        if (unlikely(IS_ERR(bip))) {