From 2f943aed1946e4ac8f9805f70b00e0beb12a326b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 13 Jun 2017 18:26:47 -0400 Subject: nspawn: Rename arg_uid_shift -> uid_shift Naming it arg_uid_shift is confusing because of the global arg_uid_shift in nspawn.c --- src/nspawn/nspawn-cgroup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c index 5274767b96..44be995252 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c @@ -73,7 +73,7 @@ int chown_cgroup(pid_t pid, 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; @@ -128,7 +128,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: -- cgit v1.2.3-54-g00ecf