Source-Changes-HG archive

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

[src/trunk]: src/sys/kern Move an assertion to the right place.



details:   https://anonhg.NetBSD.org/src/rev/ab29061acd86
branches:  trunk
changeset: 771063:ab29061acd86
user:      hannken <hannken%NetBSD.org@localhost>
date:      Mon Nov 07 08:44:16 2011 +0000

description:
Move an assertion to the right place.

Ok: YAMAMOTO Takashi <yamt%netbsd.org@localhost>

Fixes PR #45578 (kernel crash with BUFQ_PRIOCSCAN)

diffstat:

 sys/kern/bufq_priocscan.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r c90452c6fcb7 -r ab29061acd86 sys/kern/bufq_priocscan.c
--- a/sys/kern/bufq_priocscan.c Sun Nov 06 22:34:47 2011 +0000
+++ b/sys/kern/bufq_priocscan.c Mon Nov 07 08:44:16 2011 +0000
@@ -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 @@
                 *
                 * 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--;
                }
        }



Home | Main Index | Thread Index | Old Index