From ea8213dc47312e6091b38db2a783c594ebee4f5f Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 15 Apr 2022 06:08:13 +0900 Subject: [PATCH] udev: not necessary to return 1 from on_inotify() --- src/udev/udevd.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/udev/udevd.c b/src/udev/udevd.c index c2a4a8a7bd..2574844ed7 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) {