diff options
| author | Martin Hicks <mort@sgi.com> | 2005-04-17 00:24:08 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 00:24:08 +0200 |
| commit | 4c4c402d6caba5d938ffbbb49961659ecac709d4 (patch) | |
| tree | 98c85314a6c8d753e27163e729a0dbc493018ce1 /fs/proc/proc_misc.c | |
| parent | [PATCH] end_buffer_write_sync() avoid pointless assignments (diff) | |
| download | linux-4c4c402d6caba5d938ffbbb49961659ecac709d4.tar.xz linux-4c4c402d6caba5d938ffbbb49961659ecac709d4.zip | |
[PATCH] meminfo: add Cached underflow check
Working on some code lately I've been getting huge values for "Cached".
The cause is that get_page_cache_size() is an approximate value, and for a
sufficiently small returned value of get_page_cache_size() the value
underflows.
Signed-off-by: Martin Hicks <mort@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/proc/proc_misc.c')
| -rw-r--r-- | fs/proc/proc_misc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 1d75d6ab6897..a60a3b3d8a7b 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c @@ -126,6 +126,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off, unsigned long committed; unsigned long allowed; struct vmalloc_info vmi; + long cached; get_page_state(&ps); get_zone_counts(&active, &inactive, &free); @@ -140,6 +141,10 @@ 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; + if (cached < 0) + cached = 0; + get_vmalloc_info(&vmi); /* @@ -172,7 +177,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off, K(i.totalram), K(i.freeram), K(i.bufferram), - K(get_page_cache_size()-total_swapcache_pages-i.bufferram), + K(cached), K(total_swapcache_pages), K(active), K(inactive), |