From: Tejun Heo <tj@kernel.org>
Date: Sat, 16 Aug 2014 12:02:24 +0000 (-0400)
Subject: blk-mq: blk_mq_freeze_queue() should allow nesting
X-Git-Tag: omap-fixes-against-v3.17-rc3~30^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cddd5d17642cc6881352732693c2ae6930e9ce65;p=pandora-kernel.git

blk-mq: blk_mq_freeze_queue() should allow nesting

While converting to percpu_ref for freezing, add703fda981 ("blk-mq:
use percpu_ref for mq usage count") incorrectly made
blk_mq_freeze_queue() misbehave when freezing is nested due to
percpu_ref_kill() being invoked on an already killed ref.

Fix it by making blk_mq_freeze_queue() kill and kick the queue only
for the outermost freeze attempt.  All the nested ones can simply wait
for the ref to reach zero.

While at it, remove unnecessary @wake initialization from
blk_mq_unfreeze_queue().

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

Reading git-diff-tree failed