block: remove the bd_queue field from struct block_device

[platform/kernel/linux-starfive.git] / drivers / md / md.c

diff --git a/drivers/md/md.c b/drivers/md/md.c
index f567f53..8bb69c6 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -199,7 +199,7 @@ static int rdevs_init_serial(struct mddev *mddev)
 static int rdev_need_serial(struct md_rdev *rdev)
 {
        return (rdev && rdev->mddev->bitmap_info.max_write_behind > 0 &&
-               rdev->bdev->bd_queue->nr_hw_queues != 1 &&
+               rdev->bdev->bd_disk->queue->nr_hw_queues != 1 &&
                test_bit(WriteMostly, &rdev->flags));
 }
 
@@ -463,7 +463,7 @@ check_suspended:
 }
 EXPORT_SYMBOL(md_handle_request);
 
-static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio)
+static blk_qc_t md_submit_bio(struct bio *bio)
 {
        const int rw = bio_data_dir(bio);
        const int sgrp = op_stat_group(bio_op(bio));
@@ -475,7 +475,7 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio)
                return BLK_QC_T_NONE;
        }
 
-       blk_queue_split(q, &bio);
+       blk_queue_split(&bio);
 
        if (mddev == NULL || mddev->pers == NULL) {
                bio_io_error(bio);
@@ -5641,7 +5641,7 @@ static int md_alloc(dev_t dev, char *name)
                mddev->hold_active = UNTIL_STOP;
 
        error = -ENOMEM;
-       mddev->queue = blk_alloc_queue(md_make_request, NUMA_NO_NODE);
+       mddev->queue = blk_alloc_queue(NUMA_NO_NODE);
        if (!mddev->queue)
                goto abort;
 
@@ -7823,6 +7823,7 @@ static int md_revalidate(struct gendisk *disk)
 static const struct block_device_operations md_fops =
 {
        .owner          = THIS_MODULE,
+       .submit_bio     = md_submit_bio,
        .open           = md_open,
        .release        = md_release,
        .ioctl          = md_ioctl,