Module Name: src
Committed By: christos
Date: Sat Mar 1 18:32:01 UTC 2014
Modified Files:
src/sys/uvm: uvm_pager.c
Log Message:
only check that npages fit, if we are going to add npages to swpgonly.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/uvm/uvm_pager.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/uvm/uvm_pager.c
diff -u src/sys/uvm/uvm_pager.c:1.109 src/sys/uvm/uvm_pager.c:1.110
--- src/sys/uvm/uvm_pager.c:1.109 Fri Oct 25 16:27:29 2013
+++ src/sys/uvm/uvm_pager.c Sat Mar 1 13:32:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pager.c,v 1.109 2013/10/25 20:27:29 martin Exp $ */
+/* $NetBSD: uvm_pager.c,v 1.110 2014/03/01 18:32:01 christos Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.109 2013/10/25 20:27:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.110 2014/03/01 18:32:01 christos Exp $");
#include "opt_uvmhist.h"
#include "opt_readahead.h"
@@ -468,9 +468,10 @@ uvm_aio_aiodone_pages(struct vm_page **p
/* these pages are now only in swap. */
mutex_enter(&uvm_swap_data_lock);
- KASSERT(uvmexp.swpgonly + npages <= uvmexp.swpginuse);
- if (error != ENOMEM)
+ if (error != ENOMEM) {
+ KASSERT(uvmexp.swpgonly + npages <= uvmexp.swpginuse);
uvmexp.swpgonly += npages;
+ }
mutex_exit(&uvm_swap_data_lock);
if (error) {
if (error != ENOMEM)
