nvme: allow calling nvme_change_ctrl_state from irq context

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 4c49ec4349bc0aeda92af67621fae309b08393a8..d63e1fcf4437f296231c9a27942d823a22cb8fee 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -176,9 +176,10 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
                enum nvme_ctrl_state new_state)
 {
        enum nvme_ctrl_state old_state;
+       unsigned long flags;
        bool changed = false;
 
-       spin_lock_irq(&ctrl->lock);
+       spin_lock_irqsave(&ctrl->lock, flags);
 
        old_state = ctrl->state;
        switch (new_state) {
@@ -239,7 +240,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
        if (changed)
                ctrl->state = new_state;
 
-       spin_unlock_irq(&ctrl->lock);
+       spin_unlock_irqrestore(&ctrl->lock, flags);
 
        return changed;
 }