From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 28 Apr 2022 07:39:49 +0000 (+0900)
Subject: udev: drop unnecessary call of udev_watch_end()
X-Git-Tag: v252-rc1~206^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4443b1857be367b492cf74523e0842125d28ce64;p=thirdparty%2Fsystemd.git

udev: drop unnecessary call of udev_watch_end()

As it is already called by udev_event_execute_rules().
---

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 9b531051999..62c6addb9a6 100644
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -1151,23 +1151,19 @@ void udev_event_execute_run(UdevEvent *event, usec_t timeout_usec, int timeout_s
         }
 }
 
-int udev_event_process_inotify_watch(UdevEvent *event, int inotify_fd) {
+void udev_event_process_inotify_watch(UdevEvent *event, int inotify_fd) {
         sd_device *dev;
 
         assert(event);
         assert(inotify_fd >= 0);
 
-        dev = event->dev;
+        dev = ASSERT_PTR(event->dev);
 
-        assert(dev);
+        if (!event->inotify_watch)
+                return;
 
         if (device_for_action(dev, SD_DEVICE_REMOVE))
-                return 0;
-
-        if (event->inotify_watch)
-                (void) udev_watch_begin(inotify_fd, dev);
-        else
-                (void) udev_watch_end(inotify_fd, dev);
+                return;
 
-        return 0;
+        (void) udev_watch_begin(inotify_fd, dev);
 }
diff --git a/src/udev/udev-event.h b/src/udev/udev-event.h
index d201fb580a5..74d065ce23a 100644
--- a/src/udev/udev-event.h
+++ b/src/udev/udev-event.h
@@ -76,7 +76,7 @@ int udev_event_execute_rules(
                 Hashmap *properties_list,
                 UdevRules *rules);
 void udev_event_execute_run(UdevEvent *event, usec_t timeout_usec, int timeout_signal);
-int udev_event_process_inotify_watch(UdevEvent *event, int inotify_fd);
+void udev_event_process_inotify_watch(UdevEvent *event, int inotify_fd);
 
 static inline usec_t udev_warn_timeout(usec_t timeout_usec) {
         return DIV_ROUND_UP(timeout_usec, 3);
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 25496975d50..4bb6bf3a33a 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -654,9 +654,7 @@ static int worker_process_device(Manager *manager, sd_device *dev) {
                 /* in case rtnl was initialized */
                 manager->rtnl = sd_netlink_ref(udev_event->rtnl);
 
-        r = udev_event_process_inotify_watch(udev_event, manager->inotify_fd);
-        if (r < 0)
-                return r;
+        udev_event_process_inotify_watch(udev_event, manager->inotify_fd);
 
         log_device_uevent(dev, "Device processed");
         return 0;