drbd: stop using ->queuedata

Instead of setting up the queuedata as well just use one private data
field.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 45fbd526c453bc41732db26813792ee5d0631591..26f4e0aa7393b43e5a824040fdd58d4364cf4094 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2805,7 +2805,6 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
        if (!q)
                goto out_no_q;
        device->rq_queue = q;
-       q->queuedata   = device;
 
        disk = alloc_disk(1);
        if (!disk)

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index c80a2f1c3c2a73a5fc691d9f3166bb5f84a22154..3f09b2ab9778228a3a613657ae2940b21c59176c 100644 (file)
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1595,7 +1595,7 @@ void do_submit(struct work_struct *ws)
 
 blk_qc_t drbd_make_request(struct request_queue *q, struct bio *bio)
 {
-       struct drbd_device *device = (struct drbd_device *) q->queuedata;
+       struct drbd_device *device = bio->bi_disk->private_data;
        unsigned long start_jif;
 
        blk_queue_split(q, &bio);