Re: [PATCH] memcg: clean up checking of the disabled flag

Previous thread: Re: [X86][BISECTED] WARNING: at kernel/lockdep.c:2680 by Kevin Winchester on Thursday, June 5, 2008 - 4:53 pm. (1 message)

Next thread: [PATCH 0/5] x86: NMI watchdog downgrade changes by Maciej W. Rozycki on Thursday, June 5, 2008 - 7:27 pm. (4 messages)
From: Li Zefan
Date: Thursday, June 5, 2008 - 6:39 pm

Those checks are unnecessary, because when the subsystem is disabled
it can't be mounted, so those functions won't get called.

The check is needed in functions which will be called in other places
except cgroup.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
 memcontrol.c |    8 --------
 1 file changed, 8 deletions(-)

--- a/mm/memcontrol.c	2008-06-06 09:15:56.000000000 +0800
+++ b/mm/memcontrol.c	2008-06-06 09:09:04.000000000 +0800
@@ -845,9 +845,6 @@ static int mem_cgroup_force_empty(struct
 	int ret = -EBUSY;
 	int node, zid;
 
-	if (mem_cgroup_subsys.disabled)
-		return 0;
-
 	css_get(&mem->css);
 	/*
 	 * page reclaim code (kswapd etc..) will move pages between
@@ -1105,8 +1102,6 @@ static void mem_cgroup_destroy(struct cg
 static int mem_cgroup_populate(struct cgroup_subsys *ss,
 				struct cgroup *cont)
 {
-	if (mem_cgroup_subsys.disabled)
-		return 0;
 	return cgroup_add_files(cont, ss, mem_cgroup_files,
 					ARRAY_SIZE(mem_cgroup_files));
 }
@@ -1119,9 +1114,6 @@ static void mem_cgroup_move_task(struct 
 	struct mm_struct *mm;
 	struct mem_cgroup *mem, *old_mem;
 
-	if (mem_cgroup_subsys.disabled)
-		return;
-
 	mm = get_task_mm(p);
 	if (mm == NULL)
 		return;
--

From: KAMEZAWA Hiroyuki
Date: Thursday, June 5, 2008 - 6:55 pm

On Fri, 06 Jun 2008 09:39:41 +0800
Good catch!

Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>


--

From: Balbir Singh
Date: Thursday, June 5, 2008 - 6:55 pm

Yep, that should work

Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com>

-- 
	Warm Regards,
	Balbir Singh
	Linux Technology Center
	IBM, ISTL
--

From: KOSAKI Motohiro
Date: Friday, June 6, 2008 - 11:47 pm

nice.
	Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>



--

Previous thread: Re: [X86][BISECTED] WARNING: at kernel/lockdep.c:2680 by Kevin Winchester on Thursday, June 5, 2008 - 4:53 pm. (1 message)

Next thread: [PATCH 0/5] x86: NMI watchdog downgrade changes by Maciej W. Rozycki on Thursday, June 5, 2008 - 7:27 pm. (4 messages)