Commit 347ce434 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] zoned vm counters: conversion of nr_pagecache to per zone counter 



Currently a single atomic variable is used to establish the size of the page
cache in the whole machine.  The zoned VM counters have the same method of
implementation as the nr_pagecache code but also allow the determination of
the pagecache size per zone.

Remove the special implementation for nr_pagecache and make it a zoned counter
named NR_FILE_PAGES.

Updates of the page cache counters are always performed with interrupts off.
We can therefore use the __ variant here.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 65ba55f5

arch/s390/appldata/appldata_mem.c

+2 −1
Original line number Diff line number Diff line
@@ -130,7 +130,8 @@ static void appldata_get_mem_data(void *data) 
	mem_data->totalhigh = P2K(val.totalhigh);

	mem_data->freehigh  = P2K(val.freehigh);

	mem_data->bufferram = P2K(val.bufferram);

	mem_data->cached    = P2K(atomic_read(&nr_pagecache) - val.bufferram);

	mem_data->cached    = P2K(global_page_state(NR_FILE_PAGES)

				- val.bufferram);



	si_swapinfo(&val);

	mem_data->totalswap = P2K(val.totalswap);

arch/sparc/kernel/sys_sunos.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ asmlinkage int sunos_brk(unsigned long brk) 
	 * simple, it hopefully works in most obvious cases.. Easy to

	 * fool it, but this should catch most mistakes.

	 */

	freepages = get_page_cache_size();

	freepages = global_page_state(NR_FILE_PAGES);

	freepages >>= 1;

	freepages += nr_free_pages();

	freepages += nr_swap_pages;

arch/sparc64/kernel/sys_sunos32.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ asmlinkage int sunos_brk(u32 baddr) 
	 * simple, it hopefully works in most obvious cases.. Easy to

	 * fool it, but this should catch most mistakes.

	 */

	freepages = get_page_cache_size();

	freepages = global_page_state(NR_FILE_PAGES);

	freepages >>= 1;

	freepages += nr_free_pages();

	freepages += nr_swap_pages;

drivers/base/node.c

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) 
		       "Node %d LowFree:      %8lu kB\n"

		       "Node %d Dirty:        %8lu kB\n"

		       "Node %d Writeback:    %8lu kB\n"

		       "Node %d FilePages:    %8lu kB\n"

		       "Node %d Mapped:       %8lu kB\n"

		       "Node %d Slab:         %8lu kB\n",

		       nid, K(i.totalram),
@@ -82,6 +83,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) 
		       nid, K(i.freeram - i.freehigh),

		       nid, K(ps.nr_dirty),

		       nid, K(ps.nr_writeback),

		       nid, K(node_page_state(nid, NR_FILE_PAGES)),

		       nid, K(node_page_state(nid, NR_FILE_MAPPED)),

		       nid, K(ps.nr_slab));

	n += hugetlb_report_node_meminfo(nid, buf + n);

fs/proc/proc_misc.c

+2 −1
Original line number Diff line number Diff line
@@ -142,7 +142,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off, 
	allowed = ((totalram_pages - hugetlb_total_pages())

		* sysctl_overcommit_ratio / 100) + total_swap_pages;



	cached = get_page_cache_size() - total_swapcache_pages - i.bufferram;

	cached = global_page_state(NR_FILE_PAGES) -

			total_swapcache_pages - i.bufferram;

	if (cached < 0)

		cached = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE