aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block/blk-mq.c1
-rw-r--r--include/linux/blk-mq.h3
2 files changed, 1 insertions, 3 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 1a41d7aefbd5..cbd2a55d69b8 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1615,7 +1615,6 @@ static int blk_mq_init_hctx(struct request_queue *q,
1615 hctx->queue = q; 1615 hctx->queue = q;
1616 hctx->queue_num = hctx_idx; 1616 hctx->queue_num = hctx_idx;
1617 hctx->flags = set->flags; 1617 hctx->flags = set->flags;
1618 hctx->cmd_size = set->cmd_size;
1619 1618
1620 blk_mq_init_cpu_notifier(&hctx->cpu_notifier, 1619 blk_mq_init_cpu_notifier(&hctx->cpu_notifier,
1621 blk_mq_hctx_notify, hctx); 1620 blk_mq_hctx_notify, hctx);
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 3b43f509432c..d0de259e92b2 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -34,7 +34,6 @@ struct blk_mq_hw_ctx {
34 unsigned long flags; /* BLK_MQ_F_* flags */ 34 unsigned long flags; /* BLK_MQ_F_* flags */
35 35
36 struct request_queue *queue; 36 struct request_queue *queue;
37 unsigned int queue_num;
38 struct blk_flush_queue *fq; 37 struct blk_flush_queue *fq;
39 38
40 void *driver_data; 39 void *driver_data;
@@ -54,7 +53,7 @@ struct blk_mq_hw_ctx {
54 unsigned long dispatched[BLK_MQ_MAX_DISPATCH_ORDER]; 53 unsigned long dispatched[BLK_MQ_MAX_DISPATCH_ORDER];
55 54
56 unsigned int numa_node; 55 unsigned int numa_node;
57 unsigned int cmd_size; /* per-request extra data */ 56 unsigned int queue_num;
58 57
59 atomic_t nr_active; 58 atomic_t nr_active;
60 59