cgconfig: Do not touch subsystems not mounted by cgconfig

cgconfig: Do not touch subsystems not mounted by cgconfig

In its failure path, cgconfig should only touch the subsystems
it had something to do with. Currently, it unmounts all the
subsystems in the config file. Correct this.

Signed-off-by: Dhaval Giani <dhaval.giani@gmail.com>
Signed-off-by: Jan Safranek <jsafrane@redhat.com>
Acked-By: Ivana Hutarova Varekova <varekova@redhat.com>

diff --git a/src/config.c b/src/config.c
index 0dd70d849ae1d8a6bf665acdb81ee09e31c4c446..b8325a5699ddd5824005fd6e137bc9b43f8a03f4 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -431,6 +431,7 @@ static int cgroup_config_mount_fs(void)
        int ret;
        struct stat buff;
        int i;
+       int error;
 
        for (i = 0; i < config_table_index; i++) {
                struct cg_mount_table_s *curr = &(config_mount_table[i]);
@@ -439,30 +440,43 @@ static int cgroup_config_mount_fs(void)
 
                if (ret < 0 && errno != ENOENT) {
                        last_errno = errno;
-                       return ECGOTHER;
+                       error = ECGOTHER;
+                       goto out_err;
                }
 
                if (errno == ENOENT) {
                        ret = cg_mkdir_p(curr->mount.path);
-                       if (ret)
-                               return ret;
+                       if (ret) {
+                               error = ret;
+                               goto out_err;
+                       }
                } else if (!S_ISDIR(buff.st_mode)) {
                        errno = ENOTDIR;
                        last_errno = errno;
-                       return ECGOTHER;
+                       error = ECGOTHER;
+                       goto out_err;
                }
 
-               ret = cgroup_config_ajdust_mount_options(curr);
-               if (ret)
-                       return ret;
+               error = cgroup_config_ajdust_mount_options(curr);
+               if (error)
+                       goto out_err;
 
                ret = mount(CGROUP_FILESYSTEM, curr->mount.path,
                                CGROUP_FILESYSTEM, 0, curr->name);
 
-               if (ret < 0)
-                       return ECGMOUNTFAIL;
+               if (ret < 0) {
+                       error = ECGMOUNTFAIL;
+                       goto out_err;
+               }
        }
        return 0;
+out_err:
+       /*
+        * If we come here, we have failed. Since we have touched only
+        * mountpoints prior to i, we shall operate on only them now.
+        */
+       config_table_index = i;
+       return error;
 }
 
 /*