blkcg: move per-queue blkg list heads and counters to queue and blkg

[deliverable/linux.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index c3434c6395b9d6e0aa6cbe1f9fef03d1a4f545e5..83a47fcf59460d543bc3ef1435bd52a5c3e4018f 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -547,6 +547,10 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
        INIT_LIST_HEAD(&q->queue_head);
        INIT_LIST_HEAD(&q->timeout_list);
        INIT_LIST_HEAD(&q->icq_list);
+#ifdef CONFIG_BLK_CGROUP
+       INIT_LIST_HEAD(&q->blkg_list[0]);
+       INIT_LIST_HEAD(&q->blkg_list[1]);
+#endif
        INIT_LIST_HEAD(&q->flush_queue[0]);
        INIT_LIST_HEAD(&q->flush_queue[1]);
        INIT_LIST_HEAD(&q->flush_data_in_flight);