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

sd-device: do not try to read uevent file multiple times

Browse Source
This commit is contained in:
Yu Watanabe
2021-06-05 17:58:53 +09:00
parent e5ca293fcd
commit c7d6ebb13e
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-device/sd-device.c
+4 -9
View File
@@ -539,22 +539,17 @@ int device_read_uevent_file(sd_device *device) {
if (r < 0)
return r;
device->uevent_loaded = true;
path = strjoina(syspath, "/uevent");
r = read_full_virtual_file(path, &uevent, &uevent_len);
if (r == -EACCES) {
/* empty uevent files may be write-only */
device->uevent_loaded = true;
return 0;
}
if (r == -ENOENT)
/* some devices may not have uevent files, see device_set_syspath() */
if (IN_SET(r, -EACCES, -ENOENT))
/* The uevent files may be write-only, or the device may not have uevent file. */
return 0;
if (r < 0)
return log_device_debug_errno(device, r, "sd-device: Failed to read uevent file '%s': %m", path);
device->uevent_loaded = true;
for (size_t i = 0; i < uevent_len; i++)
switch (state) {
case PRE_KEY: