dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-26 11:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear existing inotify watch before processing.

Browse Source 
Likewise when re-processing an event, we want to drop the existing
inotify watch first to avoid side-effects.
This commit is contained in:
Scott James Remnant
2009-02-23 17:19:05 +00:00
parent 5ae82640c5
commit 521b3a9211
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
udev/udevd.c
View File

@@ -215,6 +215,11 @@ static void event_fork(struct udev_event *event)
/* set timeout to prevent hanging processes */
alarm(UDEV_EVENT_TIMEOUT);
/* clear any existing udev watch on the node */
if (inotify_fd != -1 &&
major(udev_device_get_devnum(event->dev)) != 0)
udev_watch_clear(event->udev, event->dev);
/* apply rules, create node, symlinks */
err = udev_event_execute_rules(event, rules);
@@ -229,12 +234,9 @@ static void event_fork(struct udev_event *event)
/* apply/restore inotify watch */
if (err == 0 && event->inotify_watch && inotify_fd != -1 &&
major(udev_device_get_devnum(event->dev)) != 0 &&
strcmp(udev_device_get_action(event->dev), "remove") != 0) {
strcmp(udev_device_get_action(event->dev), "remove") != 0)
info(event->udev, "device will be watched for changes\n");
udev_watch_begin(event->udev, event->dev);
} else {
udev_watch_clear(event->udev, event->dev);
}
info(event->udev, "seq %llu exit with %i\n", udev_device_get_seqnum(event->dev), err);
logging_close();