Wed Jan 23 00:38:02 2013 UTC ()

tweak assertions


(yamt)

diff -r1.1.2.6 -r1.1.2.7 src/sys/uvm/uvm_page_array.c

--- src/sys/uvm/uvm_page_array.c 2012/08/01 22:34:14	1.1.2.6
+++ src/sys/uvm/uvm_page_array.c 2013/01/23 00:38:01	1.1.2.7

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_page_array.c,v 1.1.2.6 2012/08/01 22:34:14 yamt Exp $	*/
+/*	$NetBSD: uvm_page_array.c,v 1.1.2.7 2013/01/23 00:38:01 yamt Exp $	*/
 /*-
  * Copyright (c)2011 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page_array.c,v 1.1.2.6 2012/08/01 22:34:14 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page_array.c,v 1.1.2.7 2013/01/23 00:38:01 yamt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_object.h>
 #include <uvm/uvm_page.h>
 #include <uvm/uvm_page_array.h>
 /*
  * uvm_page_array_init: initialize the array.
  */
 @@ -161,35 +161,35 @@ uvm_page_array_fill(struct uvm_page_arra
 		    maxpages, dense);
+	}
 	if (npages == 0) {
 		uvm_page_array_clear(ar);
 		return ENOENT;
+	}
 	KASSERT(npages <= maxpages);
 	ar->ar_npages = npages;
 	ar->ar_idx = 0;
 #if defined(DEBUG)
 	for (i = 0; i < ar->ar_npages; i++) {
 		struct vm_page * const pg = ar->ar_pages[i];
-		KASSERT(pg != NULL);
+		KDASSERT(pg != NULL);
-		KASSERT(pg->uobject == uobj);
+		KDASSERT(pg->uobject == uobj);
 		if (backward) {
-			KASSERT(pg->offset <= off);
+			KDASSERT(pg->offset <= off);
-			KASSERT(i == 0 ||
+			KDASSERT(i == 0 ||
 			    pg->offset < ar->ar_pages[i - 1]->offset);
 		} else {
-			KASSERT(pg->offset >= off);
+			KDASSERT(pg->offset >= off);
-			KASSERT(i == 0 ||
+			KDASSERT(i == 0 ||
 			    pg->offset > ar->ar_pages[i - 1]->offset);
+		}
+	}
 #endif /* defined(DEBUG) */
 	return 0;
+}
 /*
  * uvm_page_array_fill_and_peek:
  * same as uvm_page_array_peek except that, if the array is empty, try to fill
  * it first.
  */