Commit 4237de2f authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig
Browse files

nvme-loop: check for NVME_LOOP_Q_LIVE in nvme_loop_destroy_admin_queue() 



We need to check the NVME_LOOP_Q_LIVE flag in
nvme_loop_destroy_admin_queue() to protect against duplicate
invocations eg during concurrent reset and remove calls.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 1c5f8e88

drivers/nvme/target/loop.c

+2 −1
Original line number Diff line number Diff line
@@ -263,7 +263,8 @@ static const struct blk_mq_ops nvme_loop_admin_mq_ops = { 


static void nvme_loop_destroy_admin_queue(struct nvme_loop_ctrl *ctrl)

{

	clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[0].flags);

	if (!test_and_clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[0].flags))

		return;

	nvmet_sq_destroy(&ctrl->queues[0].nvme_sq);

	blk_cleanup_queue(ctrl->ctrl.admin_q);

	blk_cleanup_queue(ctrl->ctrl.fabrics_q);