[Devel] [PATCH RHEL9 COMMIT] mm/vmscan: fix /proc/vmscan output

Konstantin Khorenko khorenko at virtuozzo.com
Tue Dec 7 19:03:14 MSK 2021


The commit is pushed to "branch-rh9-5.14.vz9.1.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-4.vz9.10.33
------>
commit 1e0b0ae29ef14c7c34d887ac907f4224396138d9
Author: Andrey Zhadchenko <andrey.zhadchenko at virtuozzo.com>
Date:   Tue Dec 7 19:03:14 2021 +0300

    mm/vmscan: fix /proc/vmscan output
    
    In vz7 memcg counters had its own enum and names, but in vz8 it changed
    to vmstat ones. We added "pswpin" and "pswpout" in vmstat_text[] during
    rebase which caused half of the /proc/vmstat values to shift two rows up.
    Remove duplicate "pswpin" and "pswpout" from vmstat_text[]
    
    Fixes: 546b54bb80cf ("mm: memcontrol: add swapin/out stats")
    https://jira.sw.ru/browse/PSBM-130829
    
    Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko at virtuozzo.com>
---
 mm/vmstat.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 9b3129731404..111e12d43e4d 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1213,8 +1213,6 @@ const char * const vmstat_text[] = {
 
 	"pgfault",
 	"pgmajfault",
-	"pswpin",
-	"pswpout",
 	"pglazyfreed",
 
 	"pgrefill",


More information about the Devel mailing list