Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-6]: src/sys/arch/xen/xen Pull up revision 1.56 (requested by cegg...



details:   https://anonhg.NetBSD.org/src/rev/c4c45ca3e794
branches:  netbsd-6
changeset: 774156:c4c45ca3e794
user:      jdc <jdc%NetBSD.org@localhost>
date:      Tue Jun 05 15:36:00 2012 +0000

description:
Pull up revision 1.56 (requested by cegger in ticket #282).

destroy mutex and cv first.
Fixes LOCKDEBUG crash when a guest shut down.

diffstat:

 sys/arch/xen/xen/xbdback_xenbus.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r e6088535adde -r c4c45ca3e794 sys/arch/xen/xen/xbdback_xenbus.c
--- a/sys/arch/xen/xen/xbdback_xenbus.c Tue Jun 05 15:35:41 2012 +0000
+++ b/sys/arch/xen/xen/xbdback_xenbus.c Tue Jun 05 15:36:00 2012 +0000
@@ -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 @@
                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;
 }



Home | Main Index | Thread Index | Old Index