Commit 9743139c authored by Jens Axboe's avatar Jens Axboe

blk-mq: remove 'tag' parameter from mq_ops->poll()

We always pass in -1 now and none of the callers use the tag value,
remove the parameter.
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1052b8ac
...@@ -3380,7 +3380,7 @@ static int blk_mq_poll(struct request_queue *q, blk_qc_t cookie) ...@@ -3380,7 +3380,7 @@ static int blk_mq_poll(struct request_queue *q, blk_qc_t cookie)
hctx->poll_invoked++; hctx->poll_invoked++;
ret = q->mq_ops->poll(hctx, -1U); ret = q->mq_ops->poll(hctx);
if (ret > 0) { if (ret > 0) {
hctx->poll_success++; hctx->poll_success++;
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
......
...@@ -1075,14 +1075,14 @@ static int __nvme_poll(struct nvme_queue *nvmeq, unsigned int tag) ...@@ -1075,14 +1075,14 @@ static int __nvme_poll(struct nvme_queue *nvmeq, unsigned int tag)
return found; return found;
} }
static int nvme_poll(struct blk_mq_hw_ctx *hctx, unsigned int tag) static int nvme_poll(struct blk_mq_hw_ctx *hctx)
{ {
struct nvme_queue *nvmeq = hctx->driver_data; struct nvme_queue *nvmeq = hctx->driver_data;
return __nvme_poll(nvmeq, tag); return __nvme_poll(nvmeq, -1);
} }
static int nvme_poll_noirq(struct blk_mq_hw_ctx *hctx, unsigned int tag) static int nvme_poll_noirq(struct blk_mq_hw_ctx *hctx)
{ {
struct nvme_queue *nvmeq = hctx->driver_data; struct nvme_queue *nvmeq = hctx->driver_data;
u16 start, end; u16 start, end;
...@@ -1092,7 +1092,7 @@ static int nvme_poll_noirq(struct blk_mq_hw_ctx *hctx, unsigned int tag) ...@@ -1092,7 +1092,7 @@ static int nvme_poll_noirq(struct blk_mq_hw_ctx *hctx, unsigned int tag)
return 0; return 0;
spin_lock(&nvmeq->cq_lock); spin_lock(&nvmeq->cq_lock);
found = nvme_process_cq(nvmeq, &start, &end, tag); found = nvme_process_cq(nvmeq, &start, &end, -1);
spin_unlock(&nvmeq->cq_lock); spin_unlock(&nvmeq->cq_lock);
nvme_complete_cqes(nvmeq, start, end); nvme_complete_cqes(nvmeq, start, end);
......
...@@ -1736,7 +1736,7 @@ static blk_status_t nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx, ...@@ -1736,7 +1736,7 @@ static blk_status_t nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx,
return BLK_STS_IOERR; return BLK_STS_IOERR;
} }
static int nvme_rdma_poll(struct blk_mq_hw_ctx *hctx, unsigned int tag) static int nvme_rdma_poll(struct blk_mq_hw_ctx *hctx)
{ {
struct nvme_rdma_queue *queue = hctx->driver_data; struct nvme_rdma_queue *queue = hctx->driver_data;
struct ib_cq *cq = queue->ib_cq; struct ib_cq *cq = queue->ib_cq;
......
...@@ -132,7 +132,7 @@ typedef void (exit_request_fn)(struct blk_mq_tag_set *set, struct request *, ...@@ -132,7 +132,7 @@ typedef void (exit_request_fn)(struct blk_mq_tag_set *set, struct request *,
typedef bool (busy_iter_fn)(struct blk_mq_hw_ctx *, struct request *, void *, typedef bool (busy_iter_fn)(struct blk_mq_hw_ctx *, struct request *, void *,
bool); bool);
typedef bool (busy_tag_iter_fn)(struct request *, void *, bool); typedef bool (busy_tag_iter_fn)(struct request *, void *, bool);
typedef int (poll_fn)(struct blk_mq_hw_ctx *, unsigned int); typedef int (poll_fn)(struct blk_mq_hw_ctx *);
typedef int (map_queues_fn)(struct blk_mq_tag_set *set); typedef int (map_queues_fn)(struct blk_mq_tag_set *set);
typedef bool (busy_fn)(struct request_queue *); typedef bool (busy_fn)(struct request_queue *);
typedef void (complete_fn)(struct request *); typedef void (complete_fn)(struct request *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment