From 5c1d9a4501d1e130a1ff29c2e40d7c37b810d805 Mon Sep 17 00:00:00 2001 From: Yan Burman Date: Sun, 30 Nov 2014 08:17:24 +0000 Subject: [PATCH] isert: Stop timer as soon as we so that in busy system we don't rely on userspace Signed-off-by: Yan Burman git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/iser@5900 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/isert-scst/isert_login.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/iscsi-scst/kernel/isert-scst/isert_login.c b/iscsi-scst/kernel/isert-scst/isert_login.c index c170830ae..cd06893e6 100644 --- a/iscsi-scst/kernel/isert-scst/isert_login.c +++ b/iscsi-scst/kernel/isert-scst/isert_login.c @@ -86,8 +86,8 @@ static struct isert_conn_dev *get_available_dev(struct isert_listener_dev *dev, static void isert_del_timer(struct isert_conn_dev *dev) { if (dev->timer_active) { - del_timer_sync(&dev->tmo_timer); dev->timer_active = 0; + del_timer_sync(&dev->tmo_timer); } } @@ -234,6 +234,7 @@ int isert_conn_alloc(struct iscsi_session *session, goto cleanup_conn; conn->rd_state = 1; + isert_del_timer(dev); isert_dev_release(dev); isert_set_priv(conn, NULL);