block: only allow polling if a poll queue_map exists

This avoids having to have differnet mq_ops for different setups
with or without poll queues.

Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 9f0cb370b39b029049145c1d2a780c686717af60..bb7c642ffefa53e103134b52d5aa7ca4f84aeb73 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -402,7 +402,7 @@ static ssize_t queue_poll_store(struct request_queue *q, const char *page,
        unsigned long poll_on;
        ssize_t ret;
 
-       if (!q->mq_ops || !q->mq_ops->poll)
+       if (!q->tag_set || q->tag_set->nr_maps <= HCTX_TYPE_POLL)
                return -EINVAL;
 
        ret = queue_var_store(&poll_on, page, count);

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 4ccb4ea22ac62e3a689081e4486c809198151fb8..7732c4979a4e78d0835e2dd15c0d67791733855b 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1602,22 +1602,15 @@ static const struct blk_mq_ops nvme_mq_admin_ops = {
        .timeout        = nvme_timeout,
 };
 
-#define NVME_SHARED_MQ_OPS                                     \
-       .queue_rq               = nvme_queue_rq,                \
-       .commit_rqs             = nvme_commit_rqs,              \
-       .complete               = nvme_pci_complete_rq,         \
-       .init_hctx              = nvme_init_hctx,               \
-       .init_request           = nvme_init_request,            \
-       .map_queues             = nvme_pci_map_queues,          \
-       .timeout                = nvme_timeout                  \
-
 static const struct blk_mq_ops nvme_mq_ops = {
-       NVME_SHARED_MQ_OPS,
-};
-
-static const struct blk_mq_ops nvme_mq_poll_ops = {
-       NVME_SHARED_MQ_OPS,
-       .poll                   = nvme_poll,
+       .queue_rq       = nvme_queue_rq,
+       .complete       = nvme_pci_complete_rq,
+       .commit_rqs     = nvme_commit_rqs,
+       .init_hctx      = nvme_init_hctx,
+       .init_request   = nvme_init_request,
+       .map_queues     = nvme_pci_map_queues,
+       .timeout        = nvme_timeout,
+       .poll           = nvme_poll,
 };
 
 static void nvme_dev_remove_admin(struct nvme_dev *dev)
@@ -2304,11 +2297,7 @@ static int nvme_dev_add(struct nvme_dev *dev)
        int ret;
 
        if (!dev->ctrl.tagset) {
-               if (dev->io_queues[HCTX_TYPE_POLL])
-                       dev->tagset.ops = &nvme_mq_poll_ops;
-               else
-                       dev->tagset.ops = &nvme_mq_ops;
-
+               dev->tagset.ops = &nvme_mq_ops;
                dev->tagset.nr_hw_queues = dev->online_queues - 1;
                dev->tagset.nr_maps = HCTX_MAX_TYPES;
                dev->tagset.timeout = NVME_IO_TIMEOUT;