From: Sagi Grimberg Date: Sun, 1 Jan 2017 11:18:26 +0000 (+0200) Subject: nvmet: Call fatal_error from keep-alive timout expiration X-Git-Tag: MMI-PSA29.97-13-9~6221^2~4^2~2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=23a8ed4a624324dc696c328f09bd502c4a3816f0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Reviewed-by: Christoph Hellwig --- 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)