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>

diff --git a/drivers/base/node.c b/drivers/base/node.c
index ee090ab9171c269dfaeade5f1c1c4e5584566e70..5c39f14d15a566fe5273711dfa261ef93ac7eff7 100644 (file)
--- 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;
 }