Module Name: src
Committed By: riz
Date: Wed Nov 2 20:34:52 UTC 2011
Modified Files:
src/sys/arch/xen/xen [netbsd-5]: xbdback_xenbus.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1685):
sys/arch/xen/xen/xbdback_xenbus.c: revision 1.48
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 ...
To generate a diff of this commit:
cvs rdiff -u -r1.20.4.7 -r1.20.4.8 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.20.4.7 src/sys/arch/xen/xen/xbdback_xenbus.c:1.20.4.8
--- src/sys/arch/xen/xen/xbdback_xenbus.c:1.20.4.7 Wed Nov 2 20:30:41 2011
+++ src/sys/arch/xen/xen/xbdback_xenbus.c Wed Nov 2 20:34:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xbdback_xenbus.c,v 1.20.4.7 2011/11/02 20:30:41 riz Exp $ */
+/* $NetBSD: xbdback_xenbus.c,v 1.20.4.8 2011/11/02 20:34:52 riz Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.20.4.7 2011/11/02 20:30:41 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbdback_xenbus.c,v 1.20.4.8 2011/11/02 20:34:52 riz Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -981,7 +981,7 @@ xbdback_co_cache_flush(struct xbdback_in
/* 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 {
