OpenVZ Forum


Home » Mailing lists » Devel » [PATCH -mm] cgroup: fix boot option parsing
[PATCH -mm] cgroup: fix boot option parsing [message #28401] Mon, 17 March 2008 08:24 Go to next message
Li Zefan is currently offline  Li Zefan
Messages: 90
Registered: February 2008
Member
When boot with 'cgroup_disable=cpuacct', it turns out subsystem
'cpu' is disabled.

When Balbir posted the patch to add cgroup boot option support,
Paul M noticed this problem, but the patch was accepted without
fixing it.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
 kernel/cgroup.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index e8e8ec4..54c28ea 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -3062,25 +3062,22 @@ static void cgroup_release_agent(struct work_struct *work)
 static int __init cgroup_disable(char *str)
 {
 	int i;
+	char *token;
+
+	while ((token = strsep(&str, ",")) != NULL) {
+		if (!*token)
+			continue;
 
-	while (*str) {
 		for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
 			struct cgroup_subsys *ss = subsys[i];
 
-			if (!strncmp(str, ss->name, strlen(ss->name))) {
+			if (!strcmp(token, ss->name)) {
 				ss->disabled = 1;
 				printk(KERN_INFO "Disabling %s control group"
 					" subsystem\n", ss->name);
 				break;
 			}
 		}
-		/*
-		 * Find the next option if any
-		 */
-		while (*str && (*str != ','))
-			str++;
-		if (*str == ',')
-			str++;
 	}
 	return 1;
 }
-- 
1.5.4.rc3
_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers
Re: [PATCH -mm] cgroup: fix boot option parsing [message #28402 is a reply to message #28401] Mon, 17 March 2008 08:26 Go to previous message
Paul Menage is currently offline  Paul Menage
Messages: 642
Registered: September 2006
Senior Member
On Mon, Mar 17, 2008 at 4:24 PM, Li Zefan <lizf@cn.fujitsu.com> wrote:
> When boot with 'cgroup_disable=cpuacct', it turns out subsystem
>  'cpu' is disabled.
>
>  When Balbir posted the patch to add cgroup boot option support,
>  Paul M noticed this problem, but the patch was accepted without
>  fixing it.
>
>  Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>

Acked-by: Paul Menage <menage@google.com>

>  ---
>   kernel/cgroup.c |   15 ++++++---------
>   1 files changed, 6 insertions(+), 9 deletions(-)
>
>  diff --git a/kernel/cgroup.c b/kernel/cgroup.c
>  index e8e8ec4..54c28ea 100644
>  --- a/kernel/cgroup.c
>  +++ b/kernel/cgroup.c
>  @@ -3062,25 +3062,22 @@ static void cgroup_release_agent(struct work_struct *work)
>   static int __init cgroup_disable(char *str)
>   {
>         int i;
>  +       char *token;
>  +
>  +       while ((token = strsep(&str, ",")) != NULL) {
>  +               if (!*token)
>  +                       continue;
>
>  -       while (*str) {
>                 for (i = 0; i < CGROUP_SUBSYS_COUNT; i++) {
>                         struct cgroup_subsys *ss = subsys[i];
>
>  -                       if (!strncmp(str, ss->name, strlen(ss->name))) {
>  +                       if (!strcmp(token, ss->name)) {
>                                 ss->disabled = 1;
>                                 printk(KERN_INFO "Disabling %s control group"
>                                         " subsystem\n", ss->name);
>                                 break;
>                         }
>                 }
>  -               /*
>  -                * Find the next option if any
>  -                */
>  -               while (*str && (*str != ','))
>  -                       str++;
>  -               if (*str == ',')
>  -                       str++;
>         }
>         return 1;
>   }
>  --
>  1.5.4.rc3
>
_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/containers
Previous Topic: Containers don't handle keys, but should they?
Next Topic: [PATCH] cgroups: implement device whitelist lsm (v3)
Goto Forum:
  


Current Time: Mon Jul 22 02:27:17 GMT 2024

Total time taken to generate the page: 0.02331 seconds