diff options
| author | Christoph Lameter <clameter@sgi.com> | 2006-06-30 12:55:40 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 22:25:36 +0400 |
| commit | fd39fc8561be33065306bdac0e30414e1e8ac8e1 (patch) | |
| tree | ae0740716eed3f850a8f7232c61caebe360bb5ae /include/linux | |
| parent | ce866b34ae1b7f1ce60234cf65855886ac7e7d30 (diff) | |
| download | linux-fd39fc8561be33065306bdac0e30414e1e8ac8e1.tar.xz | |
[PATCH] zoned vm counters: conversion of nr_unstable to per zone counter
Conversion of nr_unstable to a per zone counter
We need to do some special modifications to the nfs code since there are
multiple cases of disposition and we need to have a page ref for proper
accounting.
This converts the last critical page state of the VM and therefore we need to
remove several functions that were depending on GET_PAGE_STATE_LAST in order
to make the kernel compile again. We are only left with event type counters
in page state.
[akpm@osdl.org: bugfixes]
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mmzone.h | 1 | ||||
| -rw-r--r-- | include/linux/vmstat.h | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 885cc9727001..e9d80697f555 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -55,6 +55,7 @@ enum zone_stat_item { NR_PAGETABLE, /* used for pagetables */ NR_FILE_DIRTY, NR_WRITEBACK, + NR_UNSTABLE_NFS, /* NFS unstable pages */ NR_VM_ZONE_STAT_ITEMS }; struct per_cpu_pages { diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 60c2e0382ceb..9de2a41c885c 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -22,13 +22,6 @@ * commented here. */ struct page_state { - unsigned long nr_unstable; /* NFS unstable pages */ -#define GET_PAGE_STATE_LAST nr_unstable - - /* - * The below are zeroed by get_page_state(). Use get_full_page_state() - * to add up all these. - */ unsigned long pgpgin; /* Disk reads */ unsigned long pgpgout; /* Disk writes */ unsigned long pswpin; /* swap reads */ @@ -77,8 +70,6 @@ struct page_state { unsigned long nr_bounce; /* pages for bounce buffers */ }; -extern void get_page_state(struct page_state *ret); -extern void get_page_state_node(struct page_state *ret, int node); extern void get_full_page_state(struct page_state *ret); extern unsigned long read_page_state_offset(unsigned long offset); extern void mod_page_state_offset(unsigned long offset, unsigned long delta); |