nvme: no need to wait for the reset when keepalive fails
authorChristoph Hellwig <hch@lst.de>
Mon, 12 Jun 2017 16:21:19 +0000 (18:21 +0200)
committerChristoph Hellwig <hch@lst.de>
Thu, 15 Jun 2017 13:48:45 +0000 (15:48 +0200)
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>
drivers/nvme/host/core.c

index f1b78cc2069552f4e596d54b7c5ce864bc64d89f..73342b74d3bfe4e2288b9f26d708f65944944490 100644 (file)
@@ -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;
        }
 }