CVS commit: [matt-nb5-mips64] src/sys

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Thu Feb  9 03:08:32 UTC 2012

Modified Files:
        src/sys/miscfs/genfs [matt-nb5-mips64]: genfs_io.c
        src/sys/ufs/lfs [matt-nb5-mips64]: lfs_vfsops.c

Log Message:
Change to use the updated uvm_pageout_* signature.


To generate a diff of this commit:
cvs rdiff -u -r1.13.4.2.4.3 -r1.13.4.2.4.4 src/sys/miscfs/genfs/genfs_io.c
cvs rdiff -u -r1.267.6.1 -r1.267.6.1.4.1 src/sys/ufs/lfs/lfs_vfsops.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.13.4.2.4.3 src/sys/miscfs/genfs/genfs_io.c:1.13.4.2.4.4
--- src/sys/miscfs/genfs/genfs_io.c:1.13.4.2.4.3	Wed May 25 23:58:48 2011
+++ src/sys/miscfs/genfs/genfs_io.c	Thu Feb  9 03:08:31 2012
@@ -1101,7 +1101,9 @@ retry:
 				if (tpg->flags & PG_BUSY) {
 					tpg->flags |= freeflag;
 					if (pagedaemon) {
-						uvm_pageout_start(1);
+						uvm_pageout_start(
+						    uvm_page_to_pggroup(tpg),
+						    1);
 						uvm_pagedequeue(tpg);
 					}
 				} else {
@@ -1114,8 +1116,9 @@ retry:
 
 					nextpg = TAILQ_NEXT(tpg, listq.queue);
 					uvm_pagefree(tpg);
-					if (pagedaemon)
-						uvmexp.pdfreed++;
+					if (pagedaemon) {
+						uvm_page_to_pggroup(tpg)->pgrp_pdfreed++;
+					}
 				}
 			}
 		}

Index: src/sys/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.267.6.1 src/sys/ufs/lfs/lfs_vfsops.c:1.267.6.1.4.1
--- src/sys/ufs/lfs/lfs_vfsops.c:1.267.6.1	Sat Apr  4 18:11:17 2009
+++ src/sys/ufs/lfs/lfs_vfsops.c	Thu Feb  9 03:08:31 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_vfsops.c,v 1.267.6.1 2009/04/04 18:11:17 snj Exp $	*/
+/*	lfs_vfsops.c,v 1.267.6.1 2009/04/04 18:11:17 snj Exp	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.267.6.1 2009/04/04 18:11:17 snj Exp $");
+__KERNEL_RCSID(0, "lfs_vfsops.c,v 1.267.6.1 2009/04/04 18:11:17 snj Exp");
 
 #if defined(_KERNEL_OPT)
 #include "opt_lfs.h"
@@ -1630,7 +1630,7 @@ lfs_gop_write(struct vnode *vp, struct v
 			KASSERT(!(pgs[i]->flags & PG_PAGEOUT));
 			pgs[i]->flags &= ~PG_DELWRI;
 			pgs[i]->flags |= PG_PAGEOUT;
-			uvm_pageout_start(1);
+			uvm_pageout_start(uvm_page_to_pggroup(pg), 1);
 			mutex_enter(&uvm_pageqlock);
 			uvm_pageunwire(pgs[i]);
 			mutex_exit(&uvm_pageqlock);
@@ -1815,7 +1815,7 @@ lfs_gop_write(struct vnode *vp, struct v
 		pg = pgs[i];
 
 		if (pg->flags & PG_PAGEOUT)
-			uvm_pageout_done(1);
+			uvm_pageout_done(pg, false);
 		if (pg->flags & PG_DELWRI) {
 			uvm_pageunwire(pg);
 		}