diff options
| author | Christian Brauner <brauner@kernel.org> | 2022-11-30 14:22:53 +0100 |
|---|---|---|
| committer | Christian Brauner (Microsoft) <brauner@kernel.org> | 2022-12-13 15:25:45 +0100 |
| commit | cc44af4f59066f9e64433827342ea3909c021ee8 (patch) | |
| tree | 4e527830d6469d76be2d66905dc16c908d714ada /src/nspawn/nspawn.c | |
| parent | 55371658793b7276fea30bdcd12252e1f75eb5e9 (diff) | |
| download | systemd-cc44af4f59066f9e64433827342ea3909c021ee8.tar.gz | |
nspawn: s/notify_socket/fd_socket/g
Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org>
Diffstat (limited to 'src/nspawn/nspawn.c')
| -rw-r--r-- | src/nspawn/nspawn.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 96611058fe..92d697247d 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -3631,7 +3631,7 @@ static int outer_child( bool secondary, int pid_socket, int uuid_socket, - int notify_socket, + int fd_socket, int kmsg_socket, int rtnl_socket, int uid_shift_socket, @@ -3659,7 +3659,7 @@ static int outer_child( assert(directory); assert(pid_socket >= 0); assert(uuid_socket >= 0); - assert(notify_socket >= 0); + assert(fd_socket >= 0); assert(master_pty_socket >= 0); assert(kmsg_socket >= 0); @@ -3711,7 +3711,7 @@ static int outer_child( if (r < 0) return log_error_errno(r, "Failed to pin outer mount namespace: %m"); - l = send_one_fd(notify_socket, mntns_fd, 0); + l = send_one_fd(fd_socket, mntns_fd, 0); if (l < 0) return log_error_errno(l, "Failed to send outer mount namespace fd: %m"); mntns_fd = safe_close(mntns_fd); @@ -4026,7 +4026,7 @@ static int outer_child( if (pid == 0) { pid_socket = safe_close(pid_socket); uuid_socket = safe_close(uuid_socket); - notify_socket = safe_close(notify_socket); + fd_socket = safe_close(fd_socket); uid_shift_socket = safe_close(uid_shift_socket); /* The inner child has all namespaces that are requested, so that we all are owned by the @@ -4059,13 +4059,13 @@ static int outer_child( return log_error_errno(SYNTHETIC_ERRNO(EIO), "Short write while sending machine ID."); - l = send_one_fd(notify_socket, fd, 0); + l = send_one_fd(fd_socket, fd, 0); if (l < 0) return log_error_errno(l, "Failed to send notify fd: %m"); pid_socket = safe_close(pid_socket); uuid_socket = safe_close(uuid_socket); - notify_socket = safe_close(notify_socket); + fd_socket = safe_close(fd_socket); master_pty_socket = safe_close(master_pty_socket); kmsg_socket = safe_close(kmsg_socket); rtnl_socket = safe_close(rtnl_socket); |