chiark / gitweb /
cgroup: clean-ups
authorLennart Poettering <lennart@poettering.net>
Mon, 8 Apr 2013 17:42:58 +0000 (19:42 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 8 Apr 2013 18:35:25 +0000 (20:35 +0200)
src/core/execute.c
src/shared/cgroup-util.c

index dddef14..5083af9 100644 (file)
@@ -1547,8 +1547,7 @@ int exec_spawn(ExecCommand *command,
          * outside of the cgroup) and in the parent (so that we can be
          * sure that when we kill the cgroup the process will be
          * killed too). */
-        if (cgroup_bondings)
-                cgroup_bonding_install_list(cgroup_bondings, pid, cgroup_suffix);
+        cgroup_bonding_install_list(cgroup_bondings, pid, cgroup_suffix);
 
         exec_status_start(&command->exec_status, pid);
 
index 3738ca8..c17e1d4 100644 (file)
@@ -697,7 +697,13 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
         return write_string_file(fs, c);
 }
 
-int cg_set_group_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid) {
+int cg_set_group_access(
+                const char *controller,
+                const char *path,
+                mode_t mode,
+                uid_t uid,
+                gid_t gid) {
+
         _cleanup_free_ char *fs = NULL;
         int r;