[PATCH] buffermem_pages removal (3/5)

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.

diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index e59865293c9d5ca8cd1a517ff9faae67d6c56afa..dc54a4a17045d490717b621fa3de48db4b79695f 100644 (file)
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -130,7 +130,6 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
 {
        struct sysinfo i;
        int len;
-       int pg_size ;
        struct page_state ps;
 
        get_page_state(&ps);
@@ -140,7 +139,6 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
 #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 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
                "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 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
                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),