nspawn: Merge chown_cgroup(), sync_cgroup(), and create_subcgroup() into one cgroup_setup()

1 files changed, 1 insertions, 11 deletions

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index be1b054045..d3ef37fba3 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3875,17 +3875,7 @@ static int run(int master,
                         return r;
         }
 
-        r = sync_cgroup(*pid, outer_cgver, arg_unified_cgroup_hierarchy, arg_uid_shift);
-        if (r < 0)
-                return r;
-
-        if (arg_keep_unit) {
-                r = create_subcgroup(*pid, outer_cgver, arg_unified_cgroup_hierarchy);
-                if (r < 0)
-                        return r;
-        }
-
-        r = chown_cgroup(*pid, arg_uid_shift);
+        r = cgroup_setup(*pid, outer_cgver, arg_unified_cgroup_hierarchy, arg_uid_shift, arg_keep_unit);
         if (r < 0)
                 return r;