From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 30 Sep 2019 16:00:42 -0700
Subject: [PATCH] block: Remove request_queue.nr_queues
References: bsc#1175995,jsc#SLE-15608
Git-commit: 9566256518de0520c964bdf23140eac324b136af
Patch-mainline: v5.5-rc1
Commit 897bb0c7f1ea ("blk-mq: Use proper cpumask iterator"; v4.6)
removed the last use of request_queue.nr_queues from outside
blk_mq_init_allocate_queue(). Remove this member variable to make
struct request_queue smaller. This patch does not change any
functionality.
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
block/blk-mq.c | 6 +++---
include/linux/blkdev.h | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index e54ccd7a1e47..103e1fca9916 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2876,9 +2876,9 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
/* init q->mq_kobj and sw queues' kobjects */
blk_mq_sysfs_init(q);
- q->nr_queues = nr_hw_queues(set);
- q->queue_hw_ctx = kcalloc_node(q->nr_queues, sizeof(*(q->queue_hw_ctx)),
- GFP_KERNEL, set->numa_node);
+ q->queue_hw_ctx = kcalloc_node(nr_hw_queues(set),
+ sizeof(*(q->queue_hw_ctx)), GFP_KERNEL,
+ set->numa_node);
if (!q->queue_hw_ctx)
goto err_sys_init;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 21358ee8f880..fc745e9500c5 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -411,7 +411,6 @@ struct request_queue {
/* sw queues */
struct blk_mq_ctx __percpu *queue_ctx;
- unsigned int nr_queues;
unsigned int queue_depth;
--
2.16.4