shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-03 05:18:09 +03:00
Code

nspawn: rename 'fd' variable to something more descriptive

Browse Source
This commit is contained in:
Lennart Poettering 2024-11-25 12:18:14 +01:00
parent 595ca10f37
commit 5229cd839a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nspawn/nspawn.c
View File

@ -3933,7 +3933,7 @@ static int outer_child(
_cleanup_(bind_user_context_freep) BindUserContext *bind_user_context = NULL; _cleanup_(bind_user_context_freep) BindUserContext *bind_user_context = NULL;
_cleanup_strv_free_ char **os_release_pairs = NULL; _cleanup_strv_free_ char **os_release_pairs = NULL;
_cleanup_close_ int fd = -EBADF, mntns_fd = -EBADF; _cleanup_close_ int mntns_fd = -EBADF;
bool idmap = false, enable_fuse; bool idmap = false, enable_fuse;
const char *p; const char *p;
pid_t pid; pid_t pid;
@ -4326,6 +4326,7 @@ static int outer_child(
* visible. Hence there we do it the other way round: we first allocate a new set of namespaces * visible. Hence there we do it the other way round: we first allocate a new set of namespaces
* (and fork for it) for which we then mount sysfs/procfs, and only then switch root. */ * (and fork for it) for which we then mount sysfs/procfs, and only then switch root. */
_cleanup_close_ int notify_fd = -EBADF;
if (arg_privileged) { if (arg_privileged) {
/* Mark everything as shared so our mounts get propagated down. This is required to make new /* Mark everything as shared so our mounts get propagated down. This is required to make new
* bind mounts available in systemd services inside the container that create a new mount * bind mounts available in systemd services inside the container that create a new mount
@ -4361,11 +4362,11 @@ static int outer_child(
return r; return r;
} }
fd = setup_notify_child(NULL); notify_fd = setup_notify_child(NULL);
} else } else
fd = setup_notify_child(directory); notify_fd = setup_notify_child(directory);
if (fd < 0) if (notify_fd < 0)
return fd; return notify_fd;
pid = raw_clone(SIGCHLD|CLONE_NEWNS| pid = raw_clone(SIGCHLD|CLONE_NEWNS|
arg_clone_ns_flags | arg_clone_ns_flags |
@ -4430,7 +4431,7 @@ static int outer_child(
return log_error_errno(SYNTHETIC_ERRNO(EIO), return log_error_errno(SYNTHETIC_ERRNO(EIO),
"Short write while sending machine ID."); "Short write while sending machine ID.");
l = send_one_fd(fd_outer_socket, fd, 0); l = send_one_fd(fd_outer_socket, notify_fd, 0);
if (l < 0) if (l < 0)
return log_error_errno(l, "Failed to send notify fd: %m"); return log_error_errno(l, "Failed to send notify fd: %m");