mm: memcontrol: let v2 cgroups follow changes in system swappiness

[deliverable/linux.git] / include / linux / swap.h

diff --git a/include/linux/swap.h b/include/linux/swap.h
index 2b83359c19cabee6dc211c887518d001f05081f4..0a4cd4703f403f0d65f867aaa6dcc3e128fcde05 100644 (file)
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -533,6 +533,10 @@ static inline swp_entry_t get_swap_page(void)
 #ifdef CONFIG_MEMCG
 static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg)
 {
+       /* Cgroup2 doesn't have per-cgroup swappiness */
+       if (cgroup_subsys_on_dfl(memory_cgrp_subsys))
+               return vm_swappiness;
+
        /* root ? */
        if (mem_cgroup_disabled() || !memcg->css.parent)
                return vm_swappiness;