@@ -3579,19 +3579,18 @@ static void blk_mq_init_cpu_queues(struct request_queue *q,
unsigned int nr_hw_queues)
{
struct blk_mq_tag_set *set = q->tag_set;
+ struct blk_mq_ctx *ctx;
+ struct blk_mq_hw_ctx *hctx;
unsigned int i, j;
for_each_possible_cpu(i) {
- struct blk_mq_ctx *__ctx = per_cpu_ptr(q->queue_ctx, i);
- struct blk_mq_hw_ctx *hctx;
- int k;
-
- __ctx->cpu = i;
- spin_lock_init(&__ctx->lock);
- for (k = HCTX_TYPE_DEFAULT; k < HCTX_MAX_TYPES; k++)
- INIT_LIST_HEAD(&__ctx->rq_lists[k]);
+ ctx = per_cpu_ptr(q->queue_ctx, i);
+ ctx->cpu = i;
+ ctx->queue = q;
- __ctx->queue = q;
+ spin_lock_init(&ctx->lock);
+ for (j = HCTX_TYPE_DEFAULT; j < HCTX_MAX_TYPES; j++)
+ INIT_LIST_HEAD(&ctx->rq_lists[j]);
/*
* Set local node, IFF we have more than one hw queue. If