Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdd63160 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

block: Allow unfreezing of a queue while requests are in progress 



A later patch will call blk_freeze_queue_start() followed by
blk_mq_unfreeze_queue() without waiting for q_usage_counter to drop
to zero. Make sure that this doesn't cause a kernel warning to appear
by switching from percpu_ref_reinit() to percpu_ref_resurrect(). The
former namely requires that the refcount it operates on is zero.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Jianchao Wang <jianchao.w.wang@oracle.com>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 18c9a6bb

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ void blk_mq_unfreeze_queue(struct request_queue *q) 
	freeze_depth = atomic_dec_return(&q->mq_freeze_depth);

	WARN_ON_ONCE(freeze_depth < 0);

	if (!freeze_depth) {

		percpu_ref_reinit(&q->q_usage_counter);

		percpu_ref_resurrect(&q->q_usage_counter);

		wake_up_all(&q->mq_freeze_wq);

	}

}