From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Thu, 6 Nov 2025 18:04:40 +0000 (+0000)
Subject: reread-part: fix error propagation
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74c0ed07a1bf134bb311831d39faabb55a7edfb0;p=thirdparty%2Fsystemd.git

reread-part: fix error propagation

[   49.514556] (udev-synth)[1385]: Assertion '(_error) != 0' failed at src/shared/reread-partition-table.c:260, function reread_partition_table_full(). Aborting.

Follow-up for 757887d01dd96125be1774f4b23b12f2fbda9a8b

Fixes https://github.com/systemd/systemd/issues/39603
---

diff --git a/src/shared/reread-partition-table.c b/src/shared/reread-partition-table.c
index 44eca43a68d..3cf54b9f688 100644
--- a/src/shared/reread-partition-table.c
+++ b/src/shared/reread-partition-table.c
@@ -257,7 +257,7 @@ static int reread_partition_table_full(sd_device *dev, int fd, RereadPartitionTa
         if (FLAGS_SET(flags, REREADPT_BSD_LOCK)) {
                 lock_fd = fd_reopen(fd, O_RDONLY|O_CLOEXEC|O_NOCTTY);
                 if (lock_fd < 0)
-                        return log_device_debug_errno(dev, r, "Failed top open lock fd for block device '%s': %m", p);
+                        return log_device_debug_errno(dev, lock_fd, "Failed top open lock fd for block device '%s': %m", p);
 
                 if (flock(lock_fd, LOCK_EX|LOCK_NB) < 0)
                         return log_device_debug_errno(dev, errno, "Failed to take BSD lock on block device '%s': %m", p);