md: stop using ->queuedata
authorChristoph Hellwig <hch@lst.de>
Fri, 8 May 2020 16:15:14 +0000 (18:15 +0200)
committerSong Liu <songliubraving@fb.com>
Wed, 13 May 2020 18:48:28 +0000 (11:48 -0700)
Pointer to mddev is already available in private_data.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Song Liu <songliubraving@fb.com>
drivers/md/md.c

index 7b2ac5f23260777bf4c9a58ac49ead22422c27ee..79e36cb4e8b079052be00537ff4810f8df28c736 100644 (file)
@@ -467,7 +467,7 @@ static blk_qc_t md_make_request(struct request_queue *q, struct bio *bio)
 {
        const int rw = bio_data_dir(bio);
        const int sgrp = op_stat_group(bio_op(bio));
-       struct mddev *mddev = q->queuedata;
+       struct mddev *mddev = bio->bi_disk->private_data;
        unsigned int sectors;
 
        if (unlikely(test_bit(MD_BROKEN, &mddev->flags)) && (rw == WRITE)) {
@@ -5644,7 +5644,6 @@ static int md_alloc(dev_t dev, char *name)
        mddev->queue = blk_alloc_queue(md_make_request, NUMA_NO_NODE);
        if (!mddev->queue)
                goto abort;
-       mddev->queue->queuedata = mddev;
 
        blk_set_stacking_limits(&mddev->queue->limits);