summaryrefslogtreecommitdiff
path: root/core/systemd/0001-udev-always-close-lock-file-descriptor.patch
diff options
context:
space:
mode:
Diffstat (limited to 'core/systemd/0001-udev-always-close-lock-file-descriptor.patch')
-rw-r--r--core/systemd/0001-udev-always-close-lock-file-descriptor.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/core/systemd/0001-udev-always-close-lock-file-descriptor.patch b/core/systemd/0001-udev-always-close-lock-file-descriptor.patch
deleted file mode 100644
index ed5deb556..000000000
--- a/core/systemd/0001-udev-always-close-lock-file-descriptor.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3d06f4183470d42361303086ed9dedd29c0ffc1b Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay@vrfy.org>
-Date: Tue, 3 Jun 2014 10:46:51 +0200
-Subject: [PATCH] udev: always close lock file descriptor
-
-https://bugs.freedesktop.org/show_bug.cgi?id=79576
----
- src/udev/udevd.c | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 1c9488e..819ea3b 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -301,6 +301,7 @@ static void worker_new(struct event *event)
- if (fd_lock >= 0 && flock(fd_lock, LOCK_SH|LOCK_NB) < 0) {
- log_debug("Unable to flock(%s), skipping event handling: %m", udev_device_get_devnode(d));
- err = -EWOULDBLOCK;
-+ fd_lock = safe_close(fd_lock);
- goto skip;
- }
- }
-@@ -317,8 +318,7 @@ static void worker_new(struct event *event)
- udev_device_update_db(dev);
- }
-
-- if (fd_lock >= 0)
-- close(fd_lock);
-+ safe_close(fd_lock);
-
- /* send processed event back to libudev listeners */
- udev_monitor_send_device(worker_monitor, NULL, dev);
-@@ -377,10 +377,8 @@ skip:
- }
- out:
- udev_device_unref(dev);
-- if (fd_signal >= 0)
-- close(fd_signal);
-- if (fd_ep >= 0)
-- close(fd_ep);
-+ safe_close(fd_signal);
-+ safe_close(fd_ep);
- close(fd_inotify);
- close(worker_watch[WRITE_END]);
- udev_rules_unref(rules);
---
-2.0.0
-