diff options
| author | Sagi Grimberg <sagi@grimberg.me> | 2017-01-01 13:18:26 +0200 |
|---|---|---|
| committer | Sagi Grimberg <sagi@grimberg.me> | 2017-01-26 17:45:03 +0200 |
| commit | 23a8ed4a624324dc696c328f09bd502c4a3816f0 (patch) | |
| tree | 7def47d97c2c99050220ff1e2dabd0b02af37a4c /drivers/nvme/target | |
| parent | 06406d81a2d7cfb8abcc4fa6cdfeb8e5897007c5 (diff) | |
nvmet: Call fatal_error from keep-alive timout expiration
We only need to call delete_ctrl once, so given that both
keep-alive timeout and any other fatal error can trigger it,
just make sure we only call delete_ctrl once.
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme/target')
| -rw-r--r-- | drivers/nvme/target/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index a327a43f8166..fc5ba2f9e15f 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c @@ -200,7 +200,7 @@ static void nvmet_keep_alive_timer(struct work_struct *work) pr_err("ctrl %d keep-alive timer (%d seconds) expired!\n", ctrl->cntlid, ctrl->kato); - ctrl->ops->delete_ctrl(ctrl); + nvmet_ctrl_fatal_error(ctrl); } static void nvmet_start_keep_alive_timer(struct nvmet_ctrl *ctrl) |