Module Name: othersrc
Committed By: riz
Date: Wed Jun 8 01:57:01 UTC 2011
Modified Files:
othersrc/external/bsd/iscsi/sys/dev/iscsi: iscsi_ioctl.c
Log Message:
Add a couple calls to splx(), from dyoung@. The code now works under
DIAGNOSTIC without panic.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
othersrc/external/bsd/iscsi/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: othersrc/external/bsd/iscsi/sys/dev/iscsi/iscsi_ioctl.c
diff -u othersrc/external/bsd/iscsi/sys/dev/iscsi/iscsi_ioctl.c:1.2 othersrc/external/bsd/iscsi/sys/dev/iscsi/iscsi_ioctl.c:1.3
--- othersrc/external/bsd/iscsi/sys/dev/iscsi/iscsi_ioctl.c:1.2 Tue Jun 7 23:47:51 2011
+++ othersrc/external/bsd/iscsi/sys/dev/iscsi/iscsi_ioctl.c Wed Jun 8 01:57:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_ioctl.c,v 1.2 2011/06/07 23:47:51 riz Exp $ */
+/* $NetBSD: iscsi_ioctl.c,v 1.3 2011/06/08 01:57:00 riz Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -206,6 +206,7 @@
return;
}
handler->waiter = par;
+ splx(s);
tsleep(par, PRIBIO, "iscsievtwait", 0);
}
} while (evt == NULL);
@@ -1494,6 +1495,7 @@
} else {
/* Go to sleep, but wake up every 30 seconds to check for */
/* dead event handlers */
+ splx(s);
rc = tsleep(&cleanup_list, PWAIT, "cleanup",
(TAILQ_FIRST(&event_handlers)) ? 30 * hz : 0);
s = splbio();
