SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reread-partition-table: trigger change events when we failed to lock device

Browse Source 
Before aa47d8ade1, when we failed to lock
the device node, we simply trigger change events for the device and its
partitions. But the commit killed the fallback logic. Let's restore that.

Fixes #39544.
This commit is contained in:
Yu Watanabe
2025-11-07 16:35:44 +09:00
parent fe263e9302
commit d8e38d4aaa
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/reread-partition-table.c
+10 -2
View File
@@ -259,8 +259,16 @@ static int reread_partition_table_full(sd_device *dev, int fd, RereadPartitionTa
if (lock_fd < 0)
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);
if (flock(lock_fd, LOCK_EX|LOCK_NB) < 0) {
r = log_device_debug_errno(dev, errno, "Failed to take BSD lock on block device '%s': %m", p);
if (r == -EBUSY && FLAGS_SET(flags, REREADPT_FORCE_UEVENT)) {
log_device_debug(dev, "Giving up rereading partition table of '%s'. Triggering change events for the device and its partitions.", p);
(void) trigger_partitions(dev, /* blkrrpart_success= */ false);
}
return r;
}
}
r = blockdev_partscan_enabled(dev);