diff options
Diffstat (limited to 'block/blk-core.c')
-rw-r--r-- | block/blk-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 7713c73d9590..5a1b8cc03003 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -540,9 +540,6 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) | |||
540 | if (err) | 540 | if (err) |
541 | goto fail_id; | 541 | goto fail_id; |
542 | 542 | ||
543 | if (blk_throtl_init(q)) | ||
544 | goto fail_id; | ||
545 | |||
546 | setup_timer(&q->backing_dev_info.laptop_mode_wb_timer, | 543 | setup_timer(&q->backing_dev_info.laptop_mode_wb_timer, |
547 | laptop_mode_timer_fn, (unsigned long) q); | 544 | laptop_mode_timer_fn, (unsigned long) q); |
548 | setup_timer(&q->timeout, blk_rq_timed_out_timer, (unsigned long) q); | 545 | setup_timer(&q->timeout, blk_rq_timed_out_timer, (unsigned long) q); |
@@ -565,6 +562,9 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) | |||
565 | */ | 562 | */ |
566 | q->queue_lock = &q->__queue_lock; | 563 | q->queue_lock = &q->__queue_lock; |
567 | 564 | ||
565 | if (blk_throtl_init(q)) | ||
566 | goto fail_id; | ||
567 | |||
568 | return q; | 568 | return q; |
569 | 569 | ||
570 | fail_id: | 570 | fail_id: |