| From | Chaitanya Kulkarni <> | Subject | [RFC PATCH 10/37] iomap: use bio_init_fields in direct-io | Date | Mon, 18 Jan 2021 21:06:04 -0800 |
| |
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> --- fs/iomap/direct-io.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c index 933f234d5bec..3756dbf51909 100644 --- a/fs/iomap/direct-io.c +++ b/fs/iomap/direct-io.c @@ -190,10 +190,8 @@ iomap_dio_zero(struct iomap_dio *dio, struct iomap *iomap, loff_t pos, struct bio *bio; bio = bio_alloc(GFP_KERNEL, 1); - bio_set_dev(bio, iomap->bdev); - bio->bi_iter.bi_sector = iomap_sector(iomap, pos); - bio->bi_private = dio; - bio->bi_end_io = iomap_dio_bio_end_io; + bio_init_fields(bio, iomap->bdev, iomap_sector(iomap, pos), dio, + iomap_dio_bio_end_io, 0, 0); get_page(page); __bio_add_page(bio, page, len, 0); @@ -272,12 +270,9 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length, } bio = bio_alloc(GFP_KERNEL, nr_pages); - bio_set_dev(bio, iomap->bdev); - bio->bi_iter.bi_sector = iomap_sector(iomap, pos); - bio->bi_write_hint = dio->iocb->ki_hint; - bio->bi_ioprio = dio->iocb->ki_ioprio; - bio->bi_private = dio; - bio->bi_end_io = iomap_dio_bio_end_io; + bio_init_fields(bio, iomap->bdev, iomap_sector(iomap, pos), dio, + iomap_dio_bio_end_io, dio->iocb->ki_ioprio, + dio->iocb->ki_hint); ret = bio_iov_iter_get_pages(bio, dio->submit.iter); if (unlikely(ret)) { -- 2.22.1
|