[PATCH] buffermem_pages removal (3/5)

Christoph Hellwig (hch@infradead.org)
Tue, 21 May 2002 14:10:03 +0100


This one is a bit more controveral as it may break stupid userlevel
programs: remove the 'Buffers' field from /proc/meminfo and make
the Cached field show the full pagecache size instead of subtracting
the block-device backed pages.

All /proc/meminfo-using programs I have (free, top) still work fine.

--- 1.24/fs/proc/proc_misc.c Fri May 3 07:01:31 2002
+++ edited/fs/proc/proc_misc.c Tue May 21 14:28:39 2002
@@ -130,7 +130,6 @@
{
struct sysinfo i;
int len;
- int pg_size ;
struct page_state ps;

get_page_state(&ps);
@@ -140,7 +139,6 @@
#define K(x) ((x) << (PAGE_SHIFT - 10))
si_meminfo(&i);
si_swapinfo(&i);
- pg_size = get_page_cache_size() - i.bufferram ;

/*
* Tagged format, for easy grepping and expansion.
@@ -149,7 +147,6 @@
"MemTotal: %8lu kB\n"
"MemFree: %8lu kB\n"
"MemShared: %8lu kB\n"
- "Buffers: %8lu kB\n"
"Cached: %8lu kB\n"
"SwapCached: %8lu kB\n"
"Active: %8u kB\n"
@@ -165,8 +162,7 @@
K(i.totalram),
K(i.freeram),
K(i.sharedram),
- K(i.bufferram),
- K(pg_size - swapper_space.nrpages),
+ K(ps.nr_pagecache-swapper_space.nrpages),
K(swapper_space.nrpages),
K(nr_active_pages),
K(nr_inactive_pages),
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/