[02/10] nvme: allow calling nvme_change_ctrl_state from irq context
diff mbox

Message ID 20170823175815.3646-3-hch@lst.de
State New
Headers show

Commit Message

Christoph Hellwig Aug. 23, 2017, 5:58 p.m. UTC
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/nvme/host/core.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Sagi Grimberg Aug. 28, 2017, 6:06 a.m. UTC | #1
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Keith Busch Aug. 28, 2017, 6:50 p.m. UTC | #2
Looks good.

Reviewed-by: Keith Busch <keith.busch@intel.com>

Patch
diff mbox

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index b8ecd155be19..f91c649c9ca5 100644
--- 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;
 }