Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / block / blk-zoned.c

diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 61fb6c5..38cd840 100644 (file)
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c
@@ -214,9 +214,8 @@ static int blkdev_zone_reset_all_emulated(struct block_device *bdev,
                        continue;
                }
 
-               bio = blk_next_bio(bio, 0, gfp_mask);
-               bio_set_dev(bio, bdev);
-               bio->bi_opf = REQ_OP_ZONE_RESET | REQ_SYNC;
+               bio = blk_next_bio(bio, bdev, 0, REQ_OP_ZONE_RESET | REQ_SYNC,
+                                  gfp_mask);
                bio->bi_iter.bi_sector = sector;
                sector += zone_sectors;
 
@@ -238,10 +237,7 @@ static int blkdev_zone_reset_all(struct block_device *bdev, gfp_t gfp_mask)
 {
        struct bio bio;
 
-       bio_init(&bio, NULL, 0);
-       bio_set_dev(&bio, bdev);
-       bio.bi_opf = REQ_OP_ZONE_RESET_ALL | REQ_SYNC;
-
+       bio_init(&bio, bdev, NULL, 0, REQ_OP_ZONE_RESET_ALL | REQ_SYNC);
        return submit_bio_wait(&bio);
 }
 
@@ -305,9 +301,7 @@ int blkdev_zone_mgmt(struct block_device *bdev, enum req_opf op,
        }
 
        while (sector < end_sector) {
-               bio = blk_next_bio(bio, 0, gfp_mask);
-               bio_set_dev(bio, bdev);
-               bio->bi_opf = op | REQ_SYNC;
+               bio = blk_next_bio(bio, bdev, 0, op | REQ_SYNC, gfp_mask);
                bio->bi_iter.bi_sector = sector;
                sector += zone_sectors;