[RESEND] [PATCH] memcg: Fix build warning and avoid checking for mem != null again and again

From: Nikanth Karthikesan
Date: Thu May 28 2009 - 04:49:23 EST

Resending the patch to Andrew for inclusion in -mm tree.


Fix build warning, "mem_cgroup_is_obsolete defined but not used" when
CONFIG_DEBUG_VM is not set. Also avoid checking for !mem again and again.

Signed-off-by: Nikanth Karthikesan <knikanth@xxxxxxx>
Acked-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>


diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 01c2d8f..d253846 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -314,14 +314,6 @@ static struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
return mem;

-static bool mem_cgroup_is_obsolete(struct mem_cgroup *mem)
- if (!mem)
- return true;
- return css_is_removed(&mem->css);
* Call callback function against all cgroup under hierarchy tree.
@@ -932,7 +924,7 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
if (unlikely(!mem))
return 0;

- VM_BUG_ON(!mem || mem_cgroup_is_obsolete(mem));
+ VM_BUG_ON(css_is_removed(&mem->css));

while (1) {
int ret;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/