]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
reread-part: fix error propagation
authorLuca Boccassi <luca.boccassi@gmail.com>
Thu, 6 Nov 2025 18:04:40 +0000 (18:04 +0000)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 6 Nov 2025 20:50:20 +0000 (05:50 +0900)
[   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

src/shared/reread-partition-table.c

index 44eca43a68d2ecd599ceb6651dedfa4d425c0e1b..3cf54b9f688d3c913e3d94b1a1162122710f8f34 100644 (file)
@@ -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);