scsi: avoid to quiesce sdev->request_queue two times
authorMing Lei <ming.lei@redhat.com>
Tue, 9 Nov 2021 07:11:42 +0000 (15:11 +0800)
committerJens Axboe <axboe@kernel.dk>
Tue, 9 Nov 2021 15:14:27 +0000 (08:14 -0700)
commitd2b9f12b0f7cf95c43f5fd4a18688d958d39e423
treee9d3011d2181c8e700e39ae51bb5bafdf2f0ec63
parent9ef4d0209cbadb63656a7aa29fde49c27ab2b9bf
scsi: avoid to quiesce sdev->request_queue two times

For fixing queue quiesce race between driver and block layer(elevator
switch, update nr_requests, ...), we need to support concurrent quiesce
and unquiesce, which requires the two to be balanced.

blk_mq_quiesce_queue() calls blk_mq_quiesce_queue_nowait() for updating
quiesce depth and marking the flag, then scsi_internal_device_block() calls
blk_mq_quiesce_queue_nowait() two times actually.

Fix the double quiesce and keep quiesce and unquiesce balanced.

Reported-by: Yi Zhang <yi.zhang@redhat.com>
Fixes: e70feb8b3e68 ("blk-mq: support concurrent queue quiesce/unquiesce")
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20211109071144.181581-3-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/scsi/scsi_lib.c