nfs/blocklayout: remove bl_alloc_init_bio

bio_alloc will never fail when it can sleep.  Remove the now simple
bl_alloc_init_bio helper and open code it in the only caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220124091107.642561-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index fe860c53874768552912293fcd22e5c278bcb829..38e063af7e98a43c0c28846184cd224e8aa19d7e 100644 (file)
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -115,23 +115,6 @@ bl_submit_bio(struct bio *bio)
        return NULL;
 }
 
-static struct bio *bl_alloc_init_bio(unsigned int npg,
-               struct block_device *bdev, sector_t disk_sector,
-               bio_end_io_t end_io, struct parallel_io *par)
-{
-       struct bio *bio;
-
-       npg = bio_max_segs(npg);
-       bio = bio_alloc(GFP_NOIO, npg);
-       if (bio) {
-               bio->bi_iter.bi_sector = disk_sector;
-               bio_set_dev(bio, bdev);
-               bio->bi_end_io = end_io;
-               bio->bi_private = par;
-       }
-       return bio;
-}
-
 static bool offset_in_map(u64 offset, struct pnfs_block_dev_map *map)
 {
        return offset >= map->start && offset < map->start + map->len;
@@ -171,10 +154,11 @@ do_add_page_to_bio(struct bio *bio, int npg, int rw, sector_t isect,
 
 retry:
        if (!bio) {
-               bio = bl_alloc_init_bio(npg, map->bdev,
-                               disk_addr >> SECTOR_SHIFT, end_io, par);
-               if (!bio)
-                       return ERR_PTR(-ENOMEM);
+               bio = bio_alloc(GFP_NOIO, bio_max_segs(npg));
+               bio->bi_iter.bi_sector = disk_addr >> SECTOR_SHIFT;
+               bio_set_dev(bio, map->bdev);
+               bio->bi_end_io = end_io;
+               bio->bi_private = par;
                bio_set_op_attrs(bio, rw, 0);
        }
        if (bio_add_page(bio, page, *len, offset) < *len) {