The commit is pushed to "(no" and will appear at
https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-305.3.1.el8
------>
commit 859900db9c12d71d3b00a9cebc58867b6cd661cd
Author: Konstantin Khorenko <[email protected]>
Date: Thu Jul 22 15:44:21 2021 +0300
ve/memcg: Cleanup /proc/vmstat virtualization
To_merge: ("5f48326db336 ve/memcg: Virtualize /proc/vmstat view inside CT")
https://jira.sw.ru/browse/PSBM-131992
Signed-off-by: Konstantin Khorenko <[email protected]>
---
mm/memcontrol.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 53ff720a34be..d0285243200f 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4191,9 +4191,7 @@ void mem_cgroup_fill_vmstat(struct mem_cgroup *memcg,
unsigned long *stats)
NR_VM_NODE_STAT_ITEMS +
NR_VM_WRITEBACK_STAT_ITEMS;
-
-
- zone_stats[NR_FREE_PAGES] = memory > limit ? 0 : limit- memory;
+ zone_stats[NR_FREE_PAGES] = memory > limit ? 0 : limit - memory;
for (i = LRU_BASE; i < NR_LRU_LISTS; i++) {
node_stats[NR_LRU_BASE + i] =
@@ -4201,9 +4199,9 @@ void mem_cgroup_fill_vmstat(struct mem_cgroup *memcg,
unsigned long *stats)
}
node_stats[NR_ANON_MAPPED] = node_stats[NR_ACTIVE_ANON] +
- node_stats[NR_INACTIVE_ANON];
+ node_stats[NR_INACTIVE_ANON];
node_stats[NR_FILE_PAGES] = node_stats[NR_ACTIVE_FILE] +
- node_stats[NR_INACTIVE_FILE];
+ node_stats[NR_INACTIVE_FILE];
node_stats[NR_SLAB_RECLAIMABLE_B] = mem_page_state_recursive(
memcg, NR_SLAB_RECLAIMABLE_B);
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
