[src/trunk]: src/sys/dev/iscsi Make sure callout is halted, not just stopped, ...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d9c7ea7fbffa
branches:  trunk
changeset: 337919:d9c7ea7fbffa
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun May 03 15:07:12 2015 +0000

description:
Make sure callout is halted, not just stopped, before freeing memory.

diffstat:

 sys/dev/iscsi/iscsi_ioctl.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r c5538039703a -r d9c7ea7fbffa sys/dev/iscsi/iscsi_ioctl.c
--- a/sys/dev/iscsi/iscsi_ioctl.c       Sun May 03 14:38:09 2015 +0000
+++ b/sys/dev/iscsi/iscsi_ioctl.c       Sun May 03 15:07:12 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iscsi_ioctl.c,v 1.6 2012/12/29 11:05:29 mlelstv Exp $  */
+/*     $NetBSD: iscsi_ioctl.c,v 1.7 2015/05/03 15:07:12 joerg Exp $    */
 
 /*-
  * Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -1524,7 +1524,7 @@
                        while (conn->usecount > 0)
                                tsleep(conn, PWAIT, "finalwait", hz);
 
-                       callout_stop(&conn->timeout);
+                       callout_halt(&conn->timeout, NULL);
                        closef(conn->sock);
                        free(conn, M_DEVBUF);