[src/yamt-pagecache]: src/sys make lfs another pager specific flag so that it...

[yamt <yamt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/694ca54e6e57
branches:  yamt-pagecache
changeset: 770842:694ca54e6e57
user:      yamt <yamt%NetBSD.org@localhost>
date:      Wed Nov 30 14:33:46 2011 +0000

description:
make lfs another pager specific flag so that it won't be affected by
an nfs hack in genfs.

diffstat:

 sys/ufs/lfs/lfs.h  |  4 ++--
 sys/uvm/uvm_page.c |  7 ++++---
 sys/uvm/uvm_page.h |  6 ++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diffs (70 lines):

diff -r 4390deee8f69 -r 694ca54e6e57 sys/ufs/lfs/lfs.h
--- a/sys/ufs/lfs/lfs.h Wed Nov 30 14:31:29 2011 +0000
+++ b/sys/ufs/lfs/lfs.h Wed Nov 30 14:33:46 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs.h,v 1.134 2011/07/11 08:27:40 hannken Exp $        */
+/*     $NetBSD: lfs.h,v 1.134.2.1 2011/11/30 14:33:46 yamt Exp $       */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -103,7 +103,7 @@
 
 /* Misc. definitions */
 #define BW_CLEAN       1               /* Flag for lfs_bwrite_ext() */
-#define PG_DELWRI      PG_PAGER1       /* Local def for delayed pageout */
+#define PG_DELWRI      PG_PAGER2       /* Local def for delayed pageout */
 
 /* Resource limits */
 #define        LFS_MAX_RESOURCE(x, u)  (((x) >> 2) - 10 * (u))
diff -r 4390deee8f69 -r 694ca54e6e57 sys/uvm/uvm_page.c
--- a/sys/uvm/uvm_page.c        Wed Nov 30 14:31:29 2011 +0000
+++ b/sys/uvm/uvm_page.c        Wed Nov 30 14:33:46 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_page.c,v 1.178.2.7 2011/11/20 10:52:34 yamt Exp $  */
+/*     $NetBSD: uvm_page.c,v 1.178.2.8 2011/11/30 14:33:46 yamt Exp $  */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.178.2.7 2011/11/20 10:52:34 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page.c,v 1.178.2.8 2011/11/30 14:33:46 yamt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
@@ -1556,7 +1556,8 @@
                if (pg->flags & PG_WANTED) {
                        wakeup(pg);
                }
-               pg->flags &= ~(PG_WANTED|PG_BUSY|PG_RELEASED|PG_PAGER1);
+               pg->flags &=
+                   ~(PG_WANTED|PG_BUSY|PG_RELEASED|PG_PAGER1|PG_PAGER2);
 #ifdef UVM_PAGE_TRKOWN
                pg->owner_tag = NULL;
 #endif
diff -r 4390deee8f69 -r 694ca54e6e57 sys/uvm/uvm_page.h
--- a/sys/uvm/uvm_page.h        Wed Nov 30 14:31:29 2011 +0000
+++ b/sys/uvm/uvm_page.h        Wed Nov 30 14:33:46 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_page.h,v 1.73.2.7 2011/11/20 10:52:34 yamt Exp $   */
+/*     $NetBSD: uvm_page.h,v 1.73.2.8 2011/11/30 14:33:47 yamt Exp $   */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -181,11 +181,13 @@
 #define        PG_HOLE         0x0400          /* XXX */
 
 #define PG_PAGER1      0x1000          /* pager-specific flag */
+#define PG_PAGER2      0x2000          /* pager-specific flag */
 
 #define        UVM_PGFLAGBITS \
        "\20\1CLEAN\2DIRTY\3BUSY\4WANTED" \
        "\5PAGEOUT\6RELEASED\7FAKE\10RDONLY" \
-       "\11ZERO\12TABLED\13HOLE"
+       "\11ZERO\12TABLED\13HOLE" \
+       "\15PAGER1\16PAGER2"
 
 #define PQ_FREE                0x0001          /* page is on free list */
 #define PQ_ANON                0x0002          /* page is part of an anon, rather