From: Jelle van der Waa <jvanderwaa@redhat.com>
Date: Wed, 21 May 2025 18:02:32 +0000 (+0200)
Subject: machine-id-setup: correct argument comments
X-Git-Tag: v258-rc1~505^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=457ce7d94a0b33c1223246dc40de4454be5971c0;p=thirdparty%2Fsystemd.git

machine-id-setup: correct argument comments
---

diff --git a/src/shared/machine-id-setup.c b/src/shared/machine-id-setup.c
index b6c67510892..d4f12e4179e 100644
--- a/src/shared/machine-id-setup.c
+++ b/src/shared/machine-id-setup.c
@@ -267,7 +267,7 @@ int machine_id_setup(const char *root, sd_id128_t machine_id, MachineIdSetupFlag
 
                 unlink_run_machine_id = true;
         } else {
-                r = chase("/run/machine-id", root, CHASE_PREFIX_ROOT|CHASE_MUST_BE_REGULAR, &run_machine_id, /* ret_inode_fd= */ NULL);
+                r = chase("/run/machine-id", root, CHASE_PREFIX_ROOT|CHASE_MUST_BE_REGULAR, &run_machine_id, /* ret_fd= */ NULL);
                 if (r < 0)
                         return log_error_errno(r, "Failed to open '/run/machine-id': %m");
         }
@@ -283,7 +283,7 @@ int machine_id_setup(const char *root, sd_id128_t machine_id, MachineIdSetupFlag
         log_full(FLAGS_SET(flags, MACHINE_ID_SETUP_FORCE_TRANSIENT) ? LOG_DEBUG : LOG_INFO, "Installed transient '%s' file.", etc_machine_id);
 
         /* Mark the mount read-only (note: we are not going via FORMAT_PROC_FD_PATH() here because that fd is not updated to our new bind mount) */
-        (void) mount_follow_verbose(LOG_WARNING, /* source= */ NULL, etc_machine_id, /* fstype= */ NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, /* options= */ NULL);
+        (void) mount_follow_verbose(LOG_WARNING, /* what= */ NULL, etc_machine_id, /* fstype= */ NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, /* options= */ NULL);
 
 finish:
         if (!in_initrd())
@@ -394,7 +394,7 @@ int machine_id_commit(const char *root) {
                                          "Failed to switch back to initial mount namespace: %m.\n"
                                          "We'll keep transient %s file until next reboot.", etc_machine_id);
 
-        r = umountat_detach_verbose(LOG_DEBUG, fd, /* filename= */ NULL);
+        r = umountat_detach_verbose(LOG_DEBUG, fd, /* where= */ NULL);
         if (r < 0)
                 return log_warning_errno(r,
                                          "Failed to unmount transient %s file: %m.\n"