Module Name: src
Committed By: jdc
Date: Tue Jun 5 15:36:00 UTC 2012
Modified Files:
src/sys/arch/xen/xen [netbsd-6]: xbdback_xenbus.c
Log Message:
Pull up revision 1.56 (requested by cegger in ticket #282).
destroy mutex and cv first.
Fixes LOCKDEBUG crash when a guest shut down.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.55.2.1 src/sys/arch/xen/xen/xbdback_xenbus.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/arch/xen/xen/xbdback_xenbus.c
diff -u src/sys/arch/xen/xen/xbdback_xenbus.c:1.55 src/sys/arch/xen/xen/xbdback_xenbus.c:1.55.2.1
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.55 Wed Dec 7 15:47:43 2011
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Tue Jun 5 15:36:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.55 2011/12/07 15:47:43 cegger Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.55.2.1 2012/06/05 15:36:00 jdc Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.55 2011/12/07 15:47:43 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.55.2.1 2012/06/05 15:36:00 jdc Exp $");
#include <sys/atomic.h>
#include <sys/buf.h>
@@ -513,6 +513,8 @@ xbdback_xenbus_destroy(void *arg)
vn_close(xbdi->xbdi_vp, FREAD, NOCRED);
}
SLIST_REMOVE(&xbdback_instances, xbdi, xbdback_instance, next);
+ mutex_destroy(&xbdi->xbdi_lock);
+ cv_destroy(&xbdi->xbdi_cv);
kmem_free(xbdi, sizeof(*xbdi));
return 0;
}
