summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2015-06-17 07:32:25 +0200
committerKay Sievers <kay@vrfy.org>2015-06-17 07:32:25 +0200
commit2fbb6f8f7fdb47cf037a5c02cfe073cb690b1efb (patch)
treefe31845a037438ae5fd3a45bd75cfa9c4d32fbd6
parent3eb3228e583e7e07dc3f2d17ea02dcb06f30fcc0 (diff)
parentab7854df736585e42ec208012b7e2e11b652998a (diff)
Merge pull request #238 from dvdhrm/udev-epoll
udev: don't close FDs before dropping them from epoll
-rw-r--r--src/udev/udevd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index d3797bb5e6..5ce11606c9 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -735,14 +735,14 @@ static void manager_exit(Manager *manager) {
"STATUS=Starting shutdown...");
/* close sources of new events and discard buffered events */
- manager->ctrl = udev_ctrl_unref(manager->ctrl);
manager->ctrl_event = sd_event_source_unref(manager->ctrl_event);
+ manager->ctrl = udev_ctrl_unref(manager->ctrl);
- manager->fd_inotify = safe_close(manager->fd_inotify);
manager->inotify_event = sd_event_source_unref(manager->inotify_event);
+ manager->fd_inotify = safe_close(manager->fd_inotify);
- manager->monitor = udev_monitor_unref(manager->monitor);
manager->uevent_event = sd_event_source_unref(manager->uevent_event);
+ manager->monitor = udev_monitor_unref(manager->monitor);
/* discard queued events and kill workers */
event_queue_cleanup(manager, EVENT_QUEUED);