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

Commit cddcd72b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: disable irqs in nvme_freeze_queues 



The queue_lock needs to be taken with irqs disabled.  This is mostly
due to the old pre blk-mq usage pattern, but we've also picked it up
in most of the few places where we use the queue_lock with blk-mq.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 8a0ee3b5

drivers/block/nvme-core.c

+2 −2
Original line number Diff line number Diff line
@@ -2585,9 +2585,9 @@ static void nvme_freeze_queues(struct nvme_dev *dev) 
	list_for_each_entry(ns, &dev->namespaces, list) {

		blk_mq_freeze_queue_start(ns->queue);



		spin_lock(ns->queue->queue_lock);

		spin_lock_irq(ns->queue->queue_lock);

		queue_flag_set(QUEUE_FLAG_STOPPED, ns->queue);

		spin_unlock(ns->queue->queue_lock);

		spin_unlock_irq(ns->queue->queue_lock);



		blk_mq_cancel_requeue_work(ns->queue);

		blk_mq_stop_hw_queues(ns->queue);