From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 14 Apr 2022 21:08:13 +0000 (+0900)
Subject: udev: not necessary to return 1 from on_inotify()
X-Git-Tag: v252-rc1~206^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea8213dc47312e6091b38db2a783c594ebee4f5f;p=thirdparty%2Fsystemd.git

udev: not necessary to return 1 from on_inotify()
---

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index c2a4a8a7bd6..2574844ed76 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1430,17 +1430,15 @@ static int synthesize_change(sd_device *dev) {
 }
 
 static int on_inotify(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
-        Manager *manager = userdata;
+        Manager *manager = ASSERT_PTR(userdata);
         union inotify_event_buffer buffer;
         ssize_t l;
         int r;
 
-        assert(manager);
-
         l = read(fd, &buffer, sizeof(buffer));
         if (l < 0) {
                 if (ERRNO_IS_TRANSIENT(errno))
-                        return 1;
+                        return 0;
 
                 return log_error_errno(errno, "Failed to read inotify fd: %m");
         }
@@ -1468,7 +1466,7 @@ static int on_inotify(sd_event_source *s, int fd, uint32_t revents, void *userda
                  * udev_event_execute_rules() -> event_execute_rules_on_remove() -> udev_watch_end(). */
         }
 
-        return 1;
+        return 0;
 }
 
 static int on_sigterm(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) {