mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-18 13:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes race between cancel_delayed_work_sync() and conn_nop_in_delayed_work_fn() restarting the work despite of the cancel. Reported by Phil White <phil@philwhite.org>

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2054 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2010-09-04 17:35:45 +00:00
parent 19a25e5825
commit 3c902f9a48
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iscsi-scst/kernel/conn.c
+7 -2
View File
@@ -542,12 +542,16 @@ static void conn_rsp_timer_fn(unsigned long arg)
goto out;
}
} else if (!timer_pending(&conn->rsp_timer) ||
time_after(conn->rsp_timer.expires, timeout_time)) {
time_after(conn->rsp_timer.expires, timeout_time)) {
TRACE_DBG("Restarting timer on %ld (conn %p)",
timeout_time, conn);
/*
* Timer might have been restarted while we were
* entering here.
*
* Since we have not empty write_timeout_list, we are
* safe to restart the timer, because we not race with
* del_timer_sync() in conn_free().
*/
mod_timer(&conn->rsp_timer, timeout_time);
}
@@ -585,7 +589,8 @@ static void conn_nop_in_delayed_work_fn(struct delayed_work *work)
iscsi_send_nop_in(conn);
}
if (conn->nop_in_interval > 0) {
if ((conn->nop_in_interval > 0) &&
!test_bit(ISCSI_CONN_SHUTTINGDOWN, &conn->conn_aflags)) {
TRACE_DBG("Reschedule Nop-In work for conn %p", conn);
schedule_delayed_work(&conn->nop_in_delayed_work,
conn->nop_in_interval + ISCSI_ADD_SCHED_TIME);