Skip to content

Commit

Permalink
memcg: don't check mm in __memcg_kmem_{get_cache,newpage_charge}
Browse files Browse the repository at this point in the history
We already assured the current task has mm in memcg_kmem_should_charge,
no need to double check.

Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Vladimir Davydov authored and Linus Torvalds committed Dec 13, 2014
1 parent bfda7e8 commit 9d100c5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mm/memcontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -2856,7 +2856,7 @@ struct kmem_cache *__memcg_kmem_get_cache(struct kmem_cache *cachep,
VM_BUG_ON(!cachep->memcg_params);
VM_BUG_ON(!cachep->memcg_params->is_root_cache);

if (!current->mm || current->memcg_kmem_skip_account)
if (current->memcg_kmem_skip_account)
return cachep;

rcu_read_lock();
Expand Down Expand Up @@ -2942,7 +2942,7 @@ __memcg_kmem_newpage_charge(gfp_t gfp, struct mem_cgroup **_memcg, int order)
* allocations are extremely rare but can happen, for instance, for the
* cache arrays. We bring this test here.
*/
if (!current->mm || current->memcg_kmem_skip_account)
if (current->memcg_kmem_skip_account)
return true;

memcg = get_mem_cgroup_from_mm(current->mm);
Expand Down

0 comments on commit 9d100c5

Please sign in to comment.