Module Name: src
Committed By: hannken
Date: Mon Nov 7 08:44:16 UTC 2011
Modified Files:
src/sys/kern: bufq_priocscan.c
Log Message:
Move an assertion to the right place.
Ok: YAMAMOTO Takashi <[email protected]>
Fixes PR #45578 (kernel crash with BUFQ_PRIOCSCAN)
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/kern/bufq_priocscan.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/kern/bufq_priocscan.c
diff -u src/sys/kern/bufq_priocscan.c:1.15 src/sys/kern/bufq_priocscan.c:1.16
--- src/sys/kern/bufq_priocscan.c:1.15 Wed Nov 2 15:14:49 2011
+++ src/sys/kern/bufq_priocscan.c Mon Nov 7 08:44:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bufq_priocscan.c,v 1.15 2011/11/02 15:14:49 yamt Exp $ */
+/* $NetBSD: bufq_priocscan.c,v 1.16 2011/11/07 08:44:16 hannken Exp $ */
/*-
* Copyright (c)2004,2005,2006,2008,2009 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bufq_priocscan.c,v 1.15 2011/11/02 15:14:49 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bufq_priocscan.c,v 1.16 2011/11/07 08:44:16 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -297,8 +297,8 @@ bufq_priocscan_get(struct bufq_state *bu
*
* XXX account only by number of requests. is it good enough?
*/
- KASSERT(pq->q_burst > 0);
if (remove) {
+ KASSERT(pq->q_burst > 0);
pq->q_burst--;
}
}
