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

udevd: trivial refactoring of is_device_busy()

This commit is contained in:
Yu Watanabe 2019-01-29 13:53:13 +01:00
parent 92dc48ac45
commit 0bd0407efc
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/udev/udevd.c
View File

@ -743,10 +743,8 @@ static int is_device_busy(Manager *manager, struct event *event) {
continue;
/* check our old name */
if (devpath_old && streq(devpath_old, loop_devpath)) {
event->delaying_seqnum = loop_event->seqnum;
return true;
}
if (devpath_old && streq(devpath_old, loop_devpath))
goto set_delaying_seqnum;
loop_devpath_len = strlen(loop_devpath);
@ -762,24 +760,23 @@ static int is_device_busy(Manager *manager, struct event *event) {
/* devices names might have changed/swapped in the meantime */
if (major(devnum) != 0 || ifindex > 0)
continue;
event->delaying_seqnum = loop_event->seqnum;
return true;
goto set_delaying_seqnum;
}
/* parent device event found */
if (devpath[common] == '/') {
event->delaying_seqnum = loop_event->seqnum;
return true;
}
if (devpath[common] == '/')
goto set_delaying_seqnum;
/* child device event found */
if (loop_devpath[common] == '/') {
event->delaying_seqnum = loop_event->seqnum;
return true;
}
if (loop_devpath[common] == '/')
goto set_delaying_seqnum;
}
return false;
set_delaying_seqnum:
event->delaying_seqnum = loop_event->seqnum;
return true;
}
static int on_exit_timeout(sd_event_source *s, uint64_t usec, void *userdata) {