Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-block.git] / drivers / md / linear.c

diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 5f1eb91895429fa1efea50f57356b5cff575ba68..c464fb48039acf6a4039a535b91d0591c2d16cc2 100644 (file)
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -275,17 +275,17 @@ static bool linear_make_request(struct mddev *mddev, struct bio *bio)
                bio = split;
        }
 
-       bio->bi_bdev = tmp_dev->rdev->bdev;
+       bio_set_dev(bio, tmp_dev->rdev->bdev);
        bio->bi_iter.bi_sector = bio->bi_iter.bi_sector -
                start_sector + data_offset;
 
        if (unlikely((bio_op(bio) == REQ_OP_DISCARD) &&
-                    !blk_queue_discard(bdev_get_queue(bio->bi_bdev)))) {
+                    !blk_queue_discard(bio->bi_disk->queue))) {
                /* Just ignore it */
                bio_endio(bio);
        } else {
                if (mddev->gendisk)
-                       trace_block_bio_remap(bdev_get_queue(bio->bi_bdev),
+                       trace_block_bio_remap(bio->bi_disk->queue,
                                              bio, disk_devt(mddev->gendisk),
                                              bio_sector);
                mddev_check_writesame(mddev, bio);