picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sd-device: don't retry loading uevent/db files more than once

Browse source 
If for whatever reason there was nothing to load or loading failed, don't keep trying.
This commit is contained in:
Tom Gundersen 2015-04-26 01:07:42 +02:00
parent 2a2137401b
commit 7141e4f62c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libsystemd/sd-device/sd-device.c
View file

@ -500,6 +500,8 @@ int device_read_uevent_file(sd_device *device) {
if (device->uevent_loaded || device->sealed)
return 0;
device->uevent_loaded = true;
r = sd_device_get_syspath(device, &syspath);
if (r < 0)
return r;
@ -570,8 +572,6 @@ int device_read_uevent_file(sd_device *device) {
log_debug("sd-device: could not set 'MAJOR=%s' or 'MINOR=%s' from '%s': %s", major, minor, path, strerror(-r));
}
device->uevent_loaded = true;
return 0;
}
@ -1243,6 +1243,8 @@ int device_read_db_aux(sd_device *device, bool force) {
if (device->db_loaded || (!force && device->sealed))
return 0;
device->db_loaded = true;
r = device_get_id_filename(device, &id);
if (r < 0)
return r;
@ -1311,8 +1313,6 @@ int device_read_db_aux(sd_device *device, bool force) {
}
}
device->db_loaded = true;
return 0;
}