From 27ff257b45f2305508601fcc7848d104153642c68af9e27bfb8467f82affff06 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 3 Jun 2014 15:17:17 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=654 --- 1024-udev-always-close-lock-file-descriptor.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/1024-udev-always-close-lock-file-descriptor.patch b/1024-udev-always-close-lock-file-descriptor.patch index 1ed41230..aea66faf 100644 --- a/1024-udev-always-close-lock-file-descriptor.patch +++ b/1024-udev-always-close-lock-file-descriptor.patch @@ -1,4 +1,4 @@ -From 3d06f4183470d42361303086ed9dedd29c0ffc1b Mon Sep 17 00:00:00 2001 +Based on 3d06f4183470d42361303086ed9dedd29c0ffc1b Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 3 Jun 2014 10:46:51 +0200 Subject: [PATCH] udev: always close lock file descriptor @@ -16,7 +16,7 @@ index 1c9488e..819ea3b 100644 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); ++ close_nointr_nofail(fd_lock); fd_lock = -1; goto skip; } } @@ -26,7 +26,7 @@ index 1c9488e..819ea3b 100644 - if (fd_lock >= 0) - close(fd_lock); -+ safe_close(fd_lock); ++ close_nointr_nofail(fd_lock); /* send processed event back to libudev listeners */ udev_monitor_send_device(worker_monitor, NULL, dev); @@ -38,8 +38,8 @@ index 1c9488e..819ea3b 100644 - close(fd_signal); - if (fd_ep >= 0) - close(fd_ep); -+ safe_close(fd_signal); -+ safe_close(fd_ep); ++ close_nointr_nofail(fd_signal); ++ close_nointr_nofail(fd_ep); close(fd_inotify); close(worker_watch[WRITE_END]); udev_rules_unref(rules);