CVS commit: src/sys/dev/iscsi

[Michael van Elst]

Module Name:    src
Committed By:   mlelstv
Date:           Fri Dec  7 14:59:19 UTC 2018

Modified Files:
        src/sys/dev/iscsi: iscsi_ioctl.c

Log Message:
interlock isn't taken when cleaning up.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/iscsi/iscsi_ioctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/iscsi/iscsi_ioctl.c
diff -u src/sys/dev/iscsi/iscsi_ioctl.c:1.29 src/sys/dev/iscsi/iscsi_ioctl.c:1.30
--- src/sys/dev/iscsi/iscsi_ioctl.c:1.29	Wed Dec  6 04:29:58 2017
+++ src/sys/dev/iscsi/iscsi_ioctl.c	Fri Dec  7 14:59:19 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: iscsi_ioctl.c,v 1.29 2017/12/06 04:29:58 ozaki-r Exp $	*/
+/*	$NetBSD: iscsi_ioctl.c,v 1.30 2018/12/07 14:59:19 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -1783,7 +1783,7 @@ iscsi_cleanup_thread(void *par)
 
 			KASSERT(!conn->c_in_session);
 
-			callout_halt(&conn->c_timeout, &iscsi_cleanup_mtx);
+			callout_halt(&conn->c_timeout, NULL);
 			closef(conn->c_sock);
 			callout_destroy(&conn->c_timeout);
 			cv_destroy(&conn->c_idle_cv);