From 2f96eef7f86a12b81badef1c91ec2d503ae4029d Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Wed, 30 Apr 2014 13:59:34 +0200 Subject: [PATCH] library: reverting tmpfs subtraction from cached (18-FEB-2014) The subtraction was marked as reinforcing the misconception, that memory in the page cache can be considered free. The Cached value is not a sum of page cache and tmpfs, as the tmpfs memory lives in the page cache and therefore it's an inseparable part of it. --- free.1 | 4 +--- proc/sysinfo.c | 2 -- vmstat.8 | 3 +-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/free.1 b/free.1 index 21cce28a..85efef88 100644 --- a/free.1 +++ b/free.1 @@ -32,9 +32,7 @@ kernels 2.6.32, displayed as zero if not available) Memory used by kernel buffers (Buffers in /proc/meminfo) .TP \fBcached\fR -Memory used by the page cache (calculated as Cached - Shmem in -/proc/meminfo - the Cached value is actually the sum of page cache and -tmpfs memory) +Memory used by the page cache (Cached in /proc/meminfo) .SH OPTIONS .TP \fB\-b\fR, \fB\-\-bytes\fR diff --git a/proc/sysinfo.c b/proc/sysinfo.c index e07ca866..85fb0a43 100644 --- a/proc/sysinfo.c +++ b/proc/sysinfo.c @@ -682,8 +682,6 @@ nextline: } kb_swap_used = kb_swap_total - kb_swap_free; kb_main_used = kb_main_total - kb_main_free; - /* "Cached" includes "Shmem" - we want only the page cache here */ - kb_main_cached -= kb_main_shared; } /*****************************************************************/ diff --git a/vmstat.8 b/vmstat.8 index 2782a427..420d9f39 100644 --- a/vmstat.8 +++ b/vmstat.8 @@ -102,8 +102,7 @@ b: The number of processes in uninterruptible sleep. swpd: the amount of virtual memory used. free: the amount of idle memory. buff: the amount of memory used as buffers. -cache: the amount of memory used as cache (excluding tmpfs memory for -kernels 2.6.32+) +cache: the amount of memory used as cache. inact: the amount of inactive memory. (\-a option) active: the amount of active memory. (\-a option) .fi