blk-mq: update ->init_request and ->exit_request prototypes

Remove the request_idx parameter, which can't be used safely now that we
support I/O schedulers with blk-mq.  Except for a superflous check in
mtip32xx it was unused anyway.

Also pass the tag_set instead of just the driver data - this allows drivers
to avoid some code duplication in a follow on cleanup.

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

5 files changed, 16 insertions, 28 deletions

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 994403efee19..28d932906f24 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1697,9 +1697,8 @@ static void loop_queue_work(struct kthread_work *work)
         loop_handle_cmd(cmd);
 }
 
-static int loop_init_request(void *data, struct request *rq,
-                unsigned int hctx_idx, unsigned int request_idx,
-                unsigned int numa_node)
+static int loop_init_request(struct blk_mq_tag_set *set, struct request *rq,
+                unsigned int hctx_idx, unsigned int numa_node)
 {
         struct loop_cmd *cmd = blk_mq_rq_to_pdu(rq);
 
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 9108be601a64..96fe6500e941 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -3818,10 +3818,10 @@ static int mtip_queue_rq(struct blk_mq_hw_ctx *hctx,
         return BLK_MQ_RQ_QUEUE_ERROR;
 }
 
-static void mtip_free_cmd(void *data, struct request *rq,
-                          unsigned int hctx_idx, unsigned int request_idx)
+static void mtip_free_cmd(struct blk_mq_tag_set *set, struct request *rq,
+                          unsigned int hctx_idx)
 {
-        struct driver_data *dd = data;
+        struct driver_data *dd = set->driver_data;
         struct mtip_cmd *cmd = blk_mq_rq_to_pdu(rq);
 
         if (!cmd->command)
@@ -3831,20 +3831,12 @@ static void mtip_free_cmd(void *data, struct request *rq,
                                 cmd->command, cmd->command_dma);
 }
 
-static int mtip_init_cmd(void *data, struct request *rq, unsigned int hctx_idx,
-                         unsigned int request_idx, unsigned int numa_node)
+static int mtip_init_cmd(struct blk_mq_tag_set *set, struct request *rq,
+                         unsigned int hctx_idx, unsigned int numa_node)
 {
-        struct driver_data *dd = data;
+        struct driver_data *dd = set->driver_data;
         struct mtip_cmd *cmd = blk_mq_rq_to_pdu(rq);
 
-        /*
-         * For flush requests, request_idx starts at the end of the
-         * tag space.  Since we don't support FLUSH/FUA, simply return
-         * 0 as there's nothing to be done.
-         */
-        if (request_idx >= MTIP_MAX_COMMAND_SLOTS)
-                return 0;
-
         cmd->command = dmam_alloc_coherent(&dd->pdev->dev, CMD_DMA_ALLOC_SZ,
                         &cmd->command_dma, GFP_KERNEL);
         if (!cmd->command)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index ac376b9b852d..6b98ec2a3824 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1396,12 +1396,11 @@ static void nbd_dbg_close(void)
 
 #endif
 
-static int nbd_init_request(void *data, struct request *rq,
-                            unsigned int hctx_idx, unsigned int request_idx,
-                            unsigned int numa_node)
+static int nbd_init_request(struct blk_mq_tag_set *set, struct request *rq,
+                            unsigned int hctx_idx, unsigned int numa_node)
 {
         struct nbd_cmd *cmd = blk_mq_rq_to_pdu(rq);
-        cmd->nbd = data;
+        cmd->nbd = set->driver_data;
         return 0;
 }
 
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 089ac4179919..3670e8dd03fe 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -4307,9 +4307,8 @@ out:
         return ret;
 }
 
-static int rbd_init_request(void *data, struct request *rq,
-                unsigned int hctx_idx, unsigned int request_idx,
-                unsigned int numa_node)
+static int rbd_init_request(struct blk_mq_tag_set *set, struct request *rq,
+                unsigned int hctx_idx, unsigned int numa_node)
 {
         struct work_struct *work = blk_mq_rq_to_pdu(rq);
 
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index f94614257462..94173de1efaa 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -573,11 +573,10 @@ static const struct device_attribute dev_attr_cache_type_rw =
         __ATTR(cache_type, S_IRUGO|S_IWUSR,
                virtblk_cache_type_show, virtblk_cache_type_store);
 
-static int virtblk_init_request(void *data, struct request *rq,
-                unsigned int hctx_idx, unsigned int request_idx,
-                unsigned int numa_node)
+static int virtblk_init_request(struct blk_mq_tag_set *set, struct request *rq,
+                unsigned int hctx_idx, unsigned int numa_node)
 {
-        struct virtio_blk *vblk = data;
+        struct virtio_blk *vblk = set->driver_data;
         struct virtblk_req *vbr = blk_mq_rq_to_pdu(rq);
 
 #ifdef CONFIG_VIRTIO_BLK_SCSI