From: Ming Lei Date: Fri, 11 Nov 2016 12:05:31 +0000 (+0800) Subject: block: floppy: use bio_add_page() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2c73a603cd0722c0594afc9efa0a617204303348;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git block: floppy: use bio_add_page() Signed-off-by: Ming Lei Reviewed-by: Christoph Hellwig Signed-off-by: Jens Axboe --- 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;