diff options
author | Christoph Hellwig <hch@lst.de> | 2015-05-07 03:38:14 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2015-05-19 11:13:06 -0400 |
commit | cddcd72bcec3b1dc9cef7f17d724a7fe42d64cc1 (patch) | |
tree | b4838416786fc2d40b53703679feaacccfaa34c6 /drivers/block | |
parent | 8a0ee3b52df73c7b89376b03c789232b78dd2aff (diff) |
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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/nvme-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 85b8036deaa3..00e641937a8e 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c | |||
@@ -2585,9 +2585,9 @@ static void nvme_freeze_queues(struct nvme_dev *dev) | |||
2585 | list_for_each_entry(ns, &dev->namespaces, list) { | 2585 | list_for_each_entry(ns, &dev->namespaces, list) { |
2586 | blk_mq_freeze_queue_start(ns->queue); | 2586 | blk_mq_freeze_queue_start(ns->queue); |
2587 | 2587 | ||
2588 | spin_lock(ns->queue->queue_lock); | 2588 | spin_lock_irq(ns->queue->queue_lock); |
2589 | queue_flag_set(QUEUE_FLAG_STOPPED, ns->queue); | 2589 | queue_flag_set(QUEUE_FLAG_STOPPED, ns->queue); |
2590 | spin_unlock(ns->queue->queue_lock); | 2590 | spin_unlock_irq(ns->queue->queue_lock); |
2591 | 2591 | ||
2592 | blk_mq_cancel_requeue_work(ns->queue); | 2592 | blk_mq_cancel_requeue_work(ns->queue); |
2593 | blk_mq_stop_hw_queues(ns->queue); | 2593 | blk_mq_stop_hw_queues(ns->queue); |