]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
memcg: remove redundant returns
authorHugh Dickins <hughd@google.com>
Wed, 21 Mar 2012 23:34:19 +0000 (16:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Mar 2012 00:55:00 +0000 (17:55 -0700)
Remove redundant returns from ends of functions, and one blank line.

Signed-off-by: Hugh Dickins <hughd@google.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: Kirill A. Shutemov <kirill@shutemov.name>
Acked-by: Michal Hocko <mhocko@suse.cz>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/memcontrol.c

index 7572a5089d63f00831e9721921cbb4b9dfab004c..43a9ade724c7a7157c6014cbbda5240ae6eae791 100644 (file)
@@ -1391,7 +1391,6 @@ void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p)
        if (!memcg || !p)
                return;
 
-
        rcu_read_lock();
 
        mem_cgrp = memcg->css.cgroup;
@@ -1926,7 +1925,6 @@ out:
        if (unlikely(need_unlock))
                move_unlock_page_cgroup(pc, &flags);
        rcu_read_unlock();
-       return;
 }
 EXPORT_SYMBOL(mem_cgroup_update_page_stat);
 
@@ -2912,7 +2910,6 @@ direct_uncharge:
                res_counter_uncharge(&memcg->memsw, nr_pages * PAGE_SIZE);
        if (unlikely(batch->memcg != memcg))
                memcg_oom_recover(memcg);
-       return;
 }
 
 /*
@@ -3937,7 +3934,6 @@ static void memcg_get_hierarchical_limit(struct mem_cgroup *memcg,
 out:
        *mem_limit = min_limit;
        *memsw_limit = min_memsw_limit;
-       return;
 }
 
 static int mem_cgroup_reset(struct cgroup *cont, unsigned int event)