[Devel,RHEL7,COMMIT] mm/memcg: drop extra mem_cgroup_inc_failcnt()

Submitted by Konstantin Khorenko on Aug. 30, 2017, 11:37 a.m.

Details

Message ID 201708301137.v7UBb46M009496@finist_ce7.work
State New
Series "mm/memcg: drop extra mem_cgroup_inc_failcnt()"
Headers show

Commit Message

Konstantin Khorenko Aug. 30, 2017, 11:37 a.m.
The commit is pushed to "branch-rh7-3.10.0-693.1.1.vz7.37.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.1.1.el7
------>
commit 08eefdc668f199088d9185dd9e3973177da94e18
Author: Andrey Ryabinin <aryabinin@virtuozzo.com>
Date:   Wed Aug 30 14:37:04 2017 +0300

    mm/memcg: drop extra mem_cgroup_inc_failcnt()
    
    We need only one. Shoud be merged into
    	c6f8224e23d8cf ("ms/mm: memcontrol: rewrite charge API")
    
    https://jira.sw.ru/browse/PSBM-70741
    Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
---
 mm/memcontrol.c | 1 -
 1 file changed, 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 97824e2..940cca3 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2880,7 +2880,6 @@  static int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask, bool kmem_charge
 		goto bypass;
 
 	mem_cgroup_oom(mem_over_limit, gfp_mask, get_order(batch * PAGE_SIZE));
-	mem_cgroup_inc_failcnt(mem_over_limit, gfp_mask, nr_pages);
 
 nomem:
 	mem_cgroup_inc_failcnt(mem_over_limit, gfp_mask, nr_pages);