소스 검색

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>
Christoph Hellwig 8 년 전
부모
커밋
0a72bbba49
1개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 2
      drivers/nvme/host/core.c

+ 3 - 2
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 new_state)
 {
 {
 	enum nvme_ctrl_state old_state;
 	enum nvme_ctrl_state old_state;
+	unsigned long flags;
 	bool changed = false;
 	bool changed = false;
 
 
-	spin_lock_irq(&ctrl->lock);
+	spin_lock_irqsave(&ctrl->lock, flags);
 
 
 	old_state = ctrl->state;
 	old_state = ctrl->state;
 	switch (new_state) {
 	switch (new_state) {
@@ -239,7 +240,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
 	if (changed)
 	if (changed)
 		ctrl->state = new_state;
 		ctrl->state = new_state;
 
 
-	spin_unlock_irq(&ctrl->lock);
+	spin_unlock_irqrestore(&ctrl->lock, flags);
 
 
 	return changed;
 	return changed;
 }
 }