On Sun, Sep 18, 2016 at 09:37:13AM +0200, Alexander Gordeev wrote:
> CC: linux-bl...@vger.kernel.org
> Signed-off-by: Alexander Gordeev <agord...@redhat.com>
Reviewed-by: Omar Sandoval <osan...@fb.com>
> ---
> block/blk-mq.c | 2 --
> include/linux/blkdev.h | 1 -
> 2 files changed, 3 deletions(-)
>
> diff --git a/block/blk-mq.c b/block/blk-mq.c
> index 7fa58fe..276ec7b 100644
> --- a/block/blk-mq.c
> +++ b/block/blk-mq.c
> @@ -2068,8 +2068,6 @@ struct request_queue
> *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
> INIT_WORK(&q->timeout_work, blk_mq_timeout_work);
> blk_queue_rq_timeout(q, set->timeout ? set->timeout : 30 * HZ);
>
> - q->nr_queues = nr_cpu_ids;
> -
> q->queue_flags |= QUEUE_FLAG_MQ_DEFAULT;
>
> if (!(set->flags & BLK_MQ_F_SG_MERGE))
> diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
> index c47c358..0f1bf55 100644
> --- a/include/linux/blkdev.h
> +++ b/include/linux/blkdev.h
> @@ -325,7 +325,6 @@ struct request_queue {
>
> /* sw queues */
> struct blk_mq_ctx __percpu *queue_ctx;
> - unsigned int nr_queues;
>
> /* hw dispatch queues */
> struct blk_mq_hw_ctx **queue_hw_ctx;
> --
> 1.8.3.1
>
--
Omar
