]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
nspawn: sync_cgroup(): Rename arg_uid_shift -> uid_shift
authorLuke Shumaker <lukeshu@parabola.nu>
Fri, 7 Jul 2017 19:17:41 +0000 (15:17 -0400)
committerLuke Shumaker <lukeshu@parabola.nu>
Fri, 20 Jul 2018 16:12:02 +0000 (12:12 -0400)
Naming it arg_uid_shift is confusing because of the global arg_uid_shift in
nspawn.c

src/nspawn/nspawn-cgroup.c

index 0be911999aa46e5596c076b5b559280cabd207a2..4a3cd29094a8a9695622c54eb1e6c1154680d39e 100644 (file)
@@ -75,7 +75,7 @@ int chown_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) {
         return 0;
 }
 
-int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t arg_uid_shift) {
+int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) {
         _cleanup_free_ char *cgroup = NULL;
         char tree[] = "/tmp/unifiedXXXXXX", pid_string[DECIMAL_STR_MAX(pid) + 1];
         bool undo_mount = false;
@@ -129,7 +129,7 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t arg_uid_shift)
         }
 
         fn = strjoina(tree, cgroup);
-        r = chown_cgroup_path(fn, arg_uid_shift);
+        r = chown_cgroup_path(fn, uid_shift);
         if (r < 0)
                 log_error_errno(r, "Failed to chown() cgroup %s: %m", fn);
 finish: