summaryrefslogtreecommitdiffstats
path: root/drivers/block/floppy.c
diff options
context:
space:
mode:
authorMing Lei2016-11-11 13:05:31 +0100
committerJens Axboe2016-11-22 16:57:55 +0100
commit2c73a603cd0722c0594afc9efa0a617204303348 (patch)
tree2faa31860fb320a0141cc472f941ea7a637ba1fe /drivers/block/floppy.c
parentblock: drbd: remove impossible failure handling (diff)
downloadkernel-qcow2-linux-2c73a603cd0722c0594afc9efa0a617204303348.tar.gz
kernel-qcow2-linux-2c73a603cd0722c0594afc9efa0a617204303348.tar.xz
kernel-qcow2-linux-2c73a603cd0722c0594afc9efa0a617204303348.zip
block: floppy: use bio_add_page()
Signed-off-by: Ming Lei <tom.leiming@gmail.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/floppy.c')
-rw-r--r--drivers/block/floppy.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 6a3ff2b2e3ae..a391a3cfb3fe 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3807,12 +3807,9 @@ static int __floppy_read_block_0(struct block_device *bdev, int drive)
cbdata.drive = drive;
bio_init(&bio, &bio_vec, 1);
- bio_vec.bv_page = page;
- bio_vec.bv_len = size;
- bio_vec.bv_offset = 0;
- bio.bi_vcnt = 1;
- bio.bi_iter.bi_size = size;
bio.bi_bdev = bdev;
+ bio_add_page(&bio, page, size, 0);
+
bio.bi_iter.bi_sector = 0;
bio.bi_flags |= (1 << BIO_QUIET);
bio.bi_private = &cbdata;