system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-15 12:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

core/device: Add sysfs argument to device_process_new()

Browse source 
Instead of retrieving the new sysfs path in device_process_new(),
let's pass the syspath we retrieved earlier to device_process_new()
similar to how we do for other functions in core/device.c.
This commit is contained in:
Daan De Meyer 2022-05-07 14:57:52 +02:00
parent b1ba0ce800
commit 20907e5d86
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/core/device.c
View file

@ -552,16 +552,14 @@ static int device_setup_unit(Manager *m, sd_device *dev, const char *path, bool
return 0;
}
static void device_process_new(Manager *m, sd_device *dev) {
const char *sysfs, *dn, *alias;
static void device_process_new(Manager *m, sd_device *dev, const char *sysfs) {
const char *dn, *alias;
dev_t devnum;
int r;
assert(m);
assert(dev);
if (sd_device_get_syspath(dev, &sysfs) < 0)
return;
assert(sysfs);
/* Add the main unit named after the sysfs path. If this one fails, don't bother with the rest, as
* this one shall be the main device unit the others just follow. (Compare with how
@ -837,11 +835,13 @@ static void device_enumerate(Manager *m) {
if (!device_is_ready(dev))
continue;
device_process_new(m, dev);
if (sd_device_get_syspath(dev, &sysfs) < 0)
r = sd_device_get_syspath(dev, &sysfs);
if (r < 0) {
log_device_debug_errno(dev, r, "Couldn't get syspath from device, ignoring: %m");
continue;
}
device_process_new(m, dev, sysfs);
device_update_found_by_sysfs(m, sysfs, DEVICE_FOUND_UDEV, DEVICE_FOUND_UDEV);
}
@ -928,7 +928,7 @@ static int device_dispatch_io(sd_device_monitor *monitor, sd_device *dev, void *
} else if (device_is_ready(dev)) {
device_process_new(m, dev);
device_process_new(m, dev, sysfs);
r = swap_process_device_new(m, dev);
if (r < 0)