diff options
author | Hugh Dickins <hughd@google.com> | 2012-03-21 19:34:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-21 20:55:00 -0400 |
commit | 1f2b71f41ee81735c25ef326da9a0610d640abc2 (patch) | |
tree | 07d2c696698da7bf6446b11158e0291c73bbae6b /mm | |
parent | f156ab9333c7810f8c4b1a0413142f52534b2df1 (diff) |
memcg: remove redundant returns
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>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memcontrol.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 7572a5089d63..43a9ade724c7 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -1391,7 +1391,6 @@ void mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p) | |||
1391 | if (!memcg || !p) | 1391 | if (!memcg || !p) |
1392 | return; | 1392 | return; |
1393 | 1393 | ||
1394 | |||
1395 | rcu_read_lock(); | 1394 | rcu_read_lock(); |
1396 | 1395 | ||
1397 | mem_cgrp = memcg->css.cgroup; | 1396 | mem_cgrp = memcg->css.cgroup; |
@@ -1926,7 +1925,6 @@ out: | |||
1926 | if (unlikely(need_unlock)) | 1925 | if (unlikely(need_unlock)) |
1927 | move_unlock_page_cgroup(pc, &flags); | 1926 | move_unlock_page_cgroup(pc, &flags); |
1928 | rcu_read_unlock(); | 1927 | rcu_read_unlock(); |
1929 | return; | ||
1930 | } | 1928 | } |
1931 | EXPORT_SYMBOL(mem_cgroup_update_page_stat); | 1929 | EXPORT_SYMBOL(mem_cgroup_update_page_stat); |
1932 | 1930 | ||
@@ -2912,7 +2910,6 @@ direct_uncharge: | |||
2912 | res_counter_uncharge(&memcg->memsw, nr_pages * PAGE_SIZE); | 2910 | res_counter_uncharge(&memcg->memsw, nr_pages * PAGE_SIZE); |
2913 | if (unlikely(batch->memcg != memcg)) | 2911 | if (unlikely(batch->memcg != memcg)) |
2914 | memcg_oom_recover(memcg); | 2912 | memcg_oom_recover(memcg); |
2915 | return; | ||
2916 | } | 2913 | } |
2917 | 2914 | ||
2918 | /* | 2915 | /* |
@@ -3937,7 +3934,6 @@ static void memcg_get_hierarchical_limit(struct mem_cgroup *memcg, | |||
3937 | out: | 3934 | out: |
3938 | *mem_limit = min_limit; | 3935 | *mem_limit = min_limit; |
3939 | *memsw_limit = min_memsw_limit; | 3936 | *memsw_limit = min_memsw_limit; |
3940 | return; | ||
3941 | } | 3937 | } |
3942 | 3938 | ||
3943 | static int mem_cgroup_reset(struct cgroup *cont, unsigned int event) | 3939 | static int mem_cgroup_reset(struct cgroup *cont, unsigned int event) |