From: Christoph Hellwig <hch@lst.de>
Date: Mon, 12 Jun 2017 18:21:19 +0200
Subject: nvme: no need to wait for the reset when keepalive fails
Patch-mainline: v4.13-rc1
Git-commit: 39bdc5901f2525de3afab8a30b7acc04f6ce41c3
References: FATE#323952, FATE#322506
We don't need to wait for the reset from the delayed work item that
is kicked off when we don't get a keepalive.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/nvme/host/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 0d6f6f56b1d4..d37d444a6902 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -624,7 +624,7 @@ static void nvme_keep_alive_work(struct work_struct *work)
if (nvme_keep_alive(ctrl)) {
/* allocation failure, reset the controller */
dev_err(ctrl->device, "keep-alive failed\n");
- nvme_reset_ctrl_sync(ctrl);
+ nvme_reset_ctrl(ctrl);
return;
}
}
--
2.12.3