summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Gurtuvoy <maxg@mellanox.com>2018-06-19 14:45:33 +0200
committerChristoph Hellwig <hch@lst.de>2018-06-20 14:20:51 +0200
commitd68a90e148f5a82aa67654c5012071e31c0e4baa (patch)
tree2fbfdcb67c6c4385655209184b43d6676ea91476
parentnvme-rdma: don't override opts->queue_size (diff)
downloadlinux-d68a90e148f5a82aa67654c5012071e31c0e4baa.tar.xz
linux-d68a90e148f5a82aa67654c5012071e31c0e4baa.zip
nvmet: reset keep alive timer in controller enable
Controllers that are not yet enabled should not really enforce keep alive timeouts, but we still want to track a timeout and cleanup in case a host died before it enabled the controller. Hence, simply reset the keep alive timer when the controller is enabled. Suggested-by: Max Gurtovoy <maxg@mellanox.com> Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Christoph Hellwig <hch@lst.de>
-rw-r--r--drivers/nvme/target/core.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index a03da764ecae..74d4b785d2da 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -686,6 +686,14 @@ static void nvmet_start_ctrl(struct nvmet_ctrl *ctrl)
}
ctrl->csts = NVME_CSTS_RDY;
+
+ /*
+ * Controllers that are not yet enabled should not really enforce the
+ * keep alive timeout, but we still want to track a timeout and cleanup
+ * in case a host died before it enabled the controller. Hence, simply
+ * reset the keep alive timer when the controller is enabled.
+ */
+ mod_delayed_work(system_wq, &ctrl->ka_work, ctrl->kato * HZ);
}
static void nvmet_clear_ctrl(struct nvmet_ctrl *ctrl)