There is a problem in cgroup_init function

   Now if the function strtok_r get at first the controller which
precedes some other controllers on the mount-point option list,
then it removes all next controllers from the list and they are omitted.
   The test which is done by strtok_r is redundant (there is already
hasmntopt test), so the patch is removing it at all.

 E.G. use commands:

$ mount -t cgroup -o cpu,memory,net_cls lab1 /cgroup/lab1
$ mount -t cgroup -o remount,cpuset,cpu,memory,net_cls lab1 /cgroup/lab1
$ lssubsys -ma

Signed-off-by: Ivana Hutarova Varekova <varekova@redhat.com>
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>

diff --git a/src/api.c b/src/api.c
index 1e6e3c3ce21ec016d4ec2c8e0137556168bf971a..6cd0185b577cc11b103475bf02af812640874115 100644 (file)
--- a/src/api.c
+++ b/src/api.c
@@ -733,12 +733,7 @@ int cgroup_init(void)
                        if (!mntopt)
                                continue;
 
-                       mntopt = strtok_r(mntopt, ",", &strtok_buffer);
-
-                       if (strcmp(mntopt, controllers[i]))
-                               continue;
-
-                       cgroup_dbg("matched %s:%s\n", mntopt, controllers[i]);
+                       cgroup_dbg("found %s in %s\n", controllers[i], ent->mnt_opts);
 
                        /* do not have duplicates in mount table */
                        duplicate = 0;