path: root/drivers/base/node.c
diff options
authorChristoph Lameter <>2006-06-30 01:55:40 -0700
committerLinus Torvalds <>2006-06-30 11:25:36 -0700
commitfd39fc8561be33065306bdac0e30414e1e8ac8e1 (patch)
treeae0740716eed3f850a8f7232c61caebe360bb5ae /drivers/base/node.c
parentce866b34ae1b7f1ce60234cf65855886ac7e7d30 (diff)
[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. [ bugfixes] Signed-off-by: Christoph Lameter <> Cc: Trond Myklebust <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'drivers/base/node.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c
index a7b3dcbbdfc9..b73d869c9d48 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -40,13 +40,11 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
int n;
int nid = dev->id;
struct sysinfo i;
- struct page_state ps;
unsigned long inactive;
unsigned long active;
unsigned long free;
si_meminfo_node(&i, nid);
- get_page_state_node(&ps, nid);
__get_zone_counts(&active, &inactive, &free, NODE_DATA(nid));
@@ -66,6 +64,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
"Node %d Mapped: %8lu kB\n"
"Node %d AnonPages: %8lu kB\n"
"Node %d PageTables: %8lu kB\n"
+ "Node %d NFS Unstable: %8lu kB\n"
"Node %d Slab: %8lu kB\n",
nid, K(i.totalram),
nid, K(i.freeram),
@@ -82,6 +81,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
nid, K(node_page_state(nid, NR_FILE_MAPPED)),
nid, K(node_page_state(nid, NR_ANON_PAGES)),
nid, K(node_page_state(nid, NR_PAGETABLE)),
+ nid, K(node_page_state(nid, NR_UNSTABLE_NFS)),
nid, K(node_page_state(nid, NR_SLAB)));
n += hugetlb_report_node_meminfo(nid, buf + n);
return n;