svn commit: r255812 - head/sys/dev/iscsi_initiator

[Edward Tomasz Napierala]

Author: trasz
Date: Mon Sep 23 10:36:03 2013
New Revision: 255812
URL: http://svnweb.freebsd.org/changeset/base/255812

Log:
  Prevent "lock (iscsi) sx does not match earlier (sleep mutex) lock" panic
  triggered by "kldload iscsi_initiator; kldunload iscsi_initiator; kldload
  iscsi".
  
  Approved by:	re (marius)

Modified:
  head/sys/dev/iscsi_initiator/iscsi.c

Modified: head/sys/dev/iscsi_initiator/iscsi.c
==============================================================================
--- head/sys/dev/iscsi_initiator/iscsi.c	Mon Sep 23 07:53:58 2013	(r255811)
+++ head/sys/dev/iscsi_initiator/iscsi.c	Mon Sep 23 10:36:03 2013	(r255812)
@@ -717,7 +717,7 @@ iscsi_start(void)
      isc =  malloc(sizeof(struct isc_softc), M_ISCSI, M_ZERO|M_WAITOK);
      isc->dev = make_dev(&iscsi_cdevsw, max_sessions, UID_ROOT, GID_WHEEL, 0600, "iscsi");
      isc->dev->si_drv1 = isc;
-     mtx_init(&isc->isc_mtx, "iscsi", NULL, MTX_DEF);
+     mtx_init(&isc->isc_mtx, "iscsi-isc", NULL, MTX_DEF);
 
      TAILQ_INIT(&isc->isc_sess);
      /*