Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/xen/xen Fix bogus KASSERT: if there is a xbdi_io, x...



details:   https://anonhg.NetBSD.org/src/rev/e6be56cd0aac
branches:  trunk
changeset: 770618:e6be56cd0aac
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue Oct 25 17:25:47 2011 +0000

description:
Fix bogus KASSERT: if there is a xbdi_io, xbdi_pendingreqs must *NOT* be 0.
Not sure why it has stayed unoticed for so long ...

diffstat:

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

diffs (27 lines):

diff -r c295c68251a9 -r e6be56cd0aac sys/arch/xen/xen/xbdback_xenbus.c
--- a/sys/arch/xen/xen/xbdback_xenbus.c Tue Oct 25 16:56:23 2011 +0000
+++ b/sys/arch/xen/xen/xbdback_xenbus.c Tue Oct 25 17:25:47 2011 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: xbdback_xenbus.c,v 1.47 2011/10/24 18:13:50 jym Exp $      */
+/*      $NetBSD: xbdback_xenbus.c,v 1.48 2011/10/25 17:25:47 bouyer Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.47 2011/10/24 18:13:50 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.48 2011/10/25 17:25:47 bouyer Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1030,7 +1030,7 @@
                /* Some I/Os are required for this instance. Process them. */
                KASSERT(xbdi->xbdi_io->xio_operation == BLKIF_OP_READ ||
                    xbdi->xbdi_io->xio_operation == BLKIF_OP_WRITE);
-               KASSERT(xbdi->xbdi_pendingreqs == 0);
+               KASSERT(xbdi->xbdi_pendingreqs > 0);
                xbdi->xbdi_cont = xbdback_co_flush;
                xbdi->xbdi_cont_aux = xbdback_co_cache_flush2;
        } else {



Home | Main Index | Thread Index | Old Index