diff options
| author | Jens Axboe <axboe@fb.com> | 2015-03-13 08:24:49 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-03-13 08:24:49 -0600 |
| commit | 64f9b683b6418d946101a9068d133b6daa3a22aa (patch) | |
| tree | b3a6bc7255631c4f1c270b1d2123b362689f9a61 /block | |
| parent | c202baf017aea0c860e53131bc55bb1af7177e76 (diff) | |
| parent | 9a30b096b543932de218dd3501b5562e00a8792d (diff) | |
| download | linux-stable-64f9b683b6418d946101a9068d133b6daa3a22aa.tar.gz linux-stable-64f9b683b6418d946101a9068d133b6daa3a22aa.tar.bz2 linux-stable-64f9b683b6418d946101a9068d133b6daa3a22aa.zip | |
Merge branch 'for-linus' into for-4.1/core
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 4f4bea21052e..b7b8933ec241 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1938,7 +1938,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set) */ if (percpu_ref_init(&q->mq_usage_counter, blk_mq_usage_counter_release, PERCPU_REF_INIT_ATOMIC, GFP_KERNEL)) - goto err_map; + goto err_mq_usage; setup_timer(&q->timeout, blk_mq_rq_timer, (unsigned long) q); blk_queue_rq_timeout(q, 30000); @@ -1981,7 +1981,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set) blk_mq_init_cpu_queues(q, set->nr_hw_queues); if (blk_mq_init_hw_queues(q, set)) - goto err_hw; + goto err_mq_usage; mutex_lock(&all_q_mutex); list_add_tail(&q->all_q_node, &all_q_list); @@ -1993,7 +1993,7 @@ struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set) return q; -err_hw: +err_mq_usage: blk_cleanup_queue(q); err_hctxs: kfree(map); |