diff options
| author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2019-04-09 20:05:43 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-20 09:16:05 +0200 |
| commit | 9e91db59e3b9b604995b158154bfac5569669d91 (patch) | |
| tree | 4ce875bbdebcdd33c04f3d18033367acbdbd9a88 | |
| parent | d49dea545af42eae28a904b506de8d60af2c587e (diff) | |
| download | linux-stable-9e91db59e3b9b604995b158154bfac5569669d91.tar.gz linux-stable-9e91db59e3b9b604995b158154bfac5569669d91.tar.bz2 linux-stable-9e91db59e3b9b604995b158154bfac5569669d91.zip | |
mm: hide incomplete nr_indirectly_reclaimable in sysfs
In upstream branch this fixed by commit b29940c1abd7 ("mm: rename and
change semantics of nr_indirectly_reclaimable_bytes").
This fixes /sys/devices/system/node/node*/vmstat format:
...
nr_dirtied 6613155
nr_written 5796802
11089216
...
Cc: <stable@vger.kernel.org> # 4.19.y
Fixes: 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable in /proc/vmstat")
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Cc: Roman Gushchin <guro@fb.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/base/node.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index 1ac4c36e13bb..c3968e2d0a98 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -197,11 +197,16 @@ static ssize_t node_read_vmstat(struct device *dev, sum_zone_numa_state(nid, i)); #endif - for (i = 0; i < NR_VM_NODE_STAT_ITEMS; i++) + for (i = 0; i < NR_VM_NODE_STAT_ITEMS; i++) { + /* Skip hidden vmstat items. */ + if (*vmstat_text[i + NR_VM_ZONE_STAT_ITEMS + + NR_VM_NUMA_STAT_ITEMS] == '\0') + continue; n += sprintf(buf+n, "%s %lu\n", vmstat_text[i + NR_VM_ZONE_STAT_ITEMS + NR_VM_NUMA_STAT_ITEMS], node_page_state(pgdat, i)); + } return n; } |