diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-12-06 11:29:39 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-12-06 11:29:39 -0500 |
| commit | bbf76a78b4a43f66a6c212fe1306bfb56466a0de (patch) | |
| tree | fc6034bc2a94794eac52b9086af4f5df72399842 /block | |
| parent | 79f848ea36f33a20a2e2dcfe314689d012450c3c (diff) | |
| parent | 538069756ce13f9d0e0ccb7a17b6935a0bfb7cad (diff) | |
Merge tag 'v3.10.22' into v3.10-rt
This is the 3.10.22 stable release
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 416a07b13a09..630d55f9069c 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -645,10 +645,12 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) __set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags); if (blkcg_init_queue(q)) - goto fail_id; + goto fail_bdi; return q; +fail_bdi: + bdi_destroy(&q->backing_dev_info); fail_id: ida_simple_remove(&blk_queue_ida, q->id); fail_q: |