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

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

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -3380,7 +3380,7 @@ static int blk_mq_poll(struct request_queue *q, blk_qc_t cookie) 


		hctx->poll_invoked++;



		ret = q->mq_ops->poll(hctx, -1U);

		ret = q->mq_ops->poll(hctx);

		if (ret > 0) {

			hctx->poll_success++;

			__set_current_state(TASK_RUNNING);

drivers/nvme/host/pci.c

+4 −4
Original line number Diff line number Diff line
@@ -1075,14 +1075,14 @@ static int __nvme_poll(struct nvme_queue *nvmeq, unsigned int tag) 
	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;



	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;

	u16 start, end;
@@ -1092,7 +1092,7 @@ static int nvme_poll_noirq(struct blk_mq_hw_ctx *hctx, unsigned int tag) 
		return 0;



	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);



	nvme_complete_cqes(nvmeq, start, end);

drivers/nvme/host/rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -1736,7 +1736,7 @@ static blk_status_t nvme_rdma_queue_rq(struct blk_mq_hw_ctx *hctx, 
	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 ib_cq *cq = queue->ib_cq;

include/linux/blk-mq.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *,

		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 bool (busy_fn)(struct request_queue *);

typedef void (complete_fn)(struct request *);