From: Tom Gundersen <teg@jklm.no>
Date: Sun, 24 May 2015 13:10:04 +0000 (+0200)
Subject: udevd: worker - fully clean up unnecessary fds
X-Git-Tag: v221~296
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d1b1e0bc6bd020218afc5f05286bf372be283d5;p=thirdparty%2Fsystemd.git

udevd: worker - fully clean up unnecessary fds

These are only ever used in the parent process, so close them early in the worker.
---

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index afd4640ad12..d8cb046e138 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -329,11 +329,15 @@ static void worker_spawn(Manager *manager, struct event *event) {
 
                 manager_workers_free(manager);
                 event_queue_cleanup(manager, EVENT_UNDEF);
+
                 manager->monitor = udev_monitor_unref(manager->monitor);
+                manager->ctrl_conn_blocking = udev_ctrl_connection_unref(manager->ctrl_conn_blocking);
                 manager->ctrl = udev_ctrl_unref(manager->ctrl);
+
+                manager->fd_ep = safe_close(manager->fd_ep);
                 manager->fd_signal = safe_close(manager->fd_signal);
+                manager->fd_inotify = safe_close(manager->fd_inotify);
                 manager->worker_watch[READ_END] = safe_close(manager->worker_watch[READ_END]);
-                manager->fd_ep = safe_close(manager->fd_ep);
 
                 sigfillset(&mask);
                 fd_signal = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC);