From: Jelle van der Waa <jvanderwaa@redhat.com>
Date: Tue, 6 May 2025 10:27:00 +0000 (+0200)
Subject: core: correct argument comments
X-Git-Tag: v258-rc1~680^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=396b3a1ea765185e3e8370be21033a5bf8a74bd0;p=thirdparty%2Fsystemd.git

core: correct argument comments
---

diff --git a/src/core/automount.c b/src/core/automount.c
index feb97a9f99b..c3f4b6b72c6 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -661,7 +661,7 @@ static int asynchronous_expire(int dev_autofs_fd, int ioctl_fd) {
                            (int[]) { dev_autofs_fd, ioctl_fd },
                            /* n_except_fds= */ 2,
                            FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_REOPEN_LOG,
-                           /* pid= */ NULL);
+                           /* ret_pid= */ NULL);
         if (r != 0)
                 return r;
 
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index e37bf46e876..2a74380a283 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -3056,7 +3056,7 @@ int unit_check_oomd_kill(Unit *u) {
                                 LOG_UNIT_INVOCATION_ID(u),
                                 LOG_UNIT_MESSAGE(u, "systemd-oomd killed some process(es) in this unit."));
 
-        unit_notify_cgroup_oom(u, /* ManagedOOM= */ true);
+        unit_notify_cgroup_oom(u, /* managed_oom= */ true);
 
         return 1;
 }
@@ -3098,7 +3098,7 @@ int unit_check_oom(Unit *u) {
                         LOG_UNIT_INVOCATION_ID(u),
                         LOG_UNIT_MESSAGE(u, "A process of this unit has been killed by the OOM killer."));
 
-        unit_notify_cgroup_oom(u, /* ManagedOOM= */ false);
+        unit_notify_cgroup_oom(u, /* managed_oom= */ false);
 
         return 1;
 }
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 6cf92b17739..381de7528a8 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -1333,7 +1333,7 @@ static int mount_private_apivfs(
                 /* We lack permissions to mount a new instance, and it is not already mounted. But we can
                  * access the host's, so as a final fallback bind-mount it to the destination, as most likely
                  * we are inside a user manager in an unprivileged user namespace. */
-                r = mount_nofollow_verbose(LOG_DEBUG, bind_source, entry_path, /* fstype = */ NULL, MS_BIND|MS_REC, /* opts = */ NULL);
+                r = mount_nofollow_verbose(LOG_DEBUG, bind_source, entry_path, /* fstype = */ NULL, MS_BIND|MS_REC, /* options = */ NULL);
                 if (r < 0)
                         return r;
 
@@ -1348,7 +1348,7 @@ static int mount_private_apivfs(
                 log_debug_errno(r, "Failed to unmount directories below '%s', ignoring: %m", entry_path);
 
         /* Then, move the new mount instance. */
-        r = mount_nofollow_verbose(LOG_DEBUG, temporary_mount, entry_path, /* fstype = */ NULL, MS_MOVE, /* opts = */ NULL);
+        r = mount_nofollow_verbose(LOG_DEBUG, temporary_mount, entry_path, /* fstype = */ NULL, MS_MOVE, /* options = */ NULL);
         if (r < 0)
                 return r;
 
diff --git a/src/core/unit.c b/src/core/unit.c
index b42b40250f5..6eda7b64aa6 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -4170,7 +4170,7 @@ PresetAction unit_get_unit_file_preset(Unit *u) {
                                 u->manager->runtime_scope,
                                 /* root_dir= */ NULL,
                                 bn,
-                                /* cache= */ NULL));
+                                /* cached= */ NULL));
 }
 
 Unit* unit_ref_set(UnitRef *ref, Unit *source, Unit *target) {