Commit 6b55e1f2 authored by Jens Axboe's avatar Jens Axboe

blk-mq: fix potential oops on out-of-memory in __blk_mq_alloc_rq_maps()

__blk_mq_alloc_rq_maps() can be invoked multiple times, if we scale
back the queue depth if we are low on memory. So don't clear
set->tags when we fail, this is handled directly in
the parent function, blk_mq_alloc_tag_set().
Reported-by: default avatarRobert Elliott  <Elliott@hp.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent a57a178a
...@@ -1959,7 +1959,6 @@ static int __blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set) ...@@ -1959,7 +1959,6 @@ static int __blk_mq_alloc_rq_maps(struct blk_mq_tag_set *set)
while (--i >= 0) while (--i >= 0)
blk_mq_free_rq_map(set, set->tags[i], i); blk_mq_free_rq_map(set, set->tags[i], i);
set->tags = NULL;
return -ENOMEM; return -ENOMEM;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment