]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-event: mention that two debug logged events are ignored
authorLennart Poettering <lennart@poettering.net>
Mon, 23 Nov 2020 10:39:40 +0000 (11:39 +0100)
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>
Wed, 10 Mar 2021 11:41:30 +0000 (12:41 +0100)
(cherry picked from commit f80a5d6a86dc2346f406ee086ba179879afaab70)

Related: #1819868

src/libsystemd/sd-event/sd-event.c

index df5ed0dce8820776066e36cb06a986fe67ace045..0f507f18d8f6458fd58d1684af8bb634cad5f2bb 100644 (file)
@@ -596,8 +596,6 @@ static bool event_pid_changed(sd_event *e) {
 }
 
 static void source_io_unregister(sd_event_source *s) {
-        int r;
-
         assert(s);
         assert(s->type == SOURCE_IO);
 
@@ -607,9 +605,8 @@ static void source_io_unregister(sd_event_source *s) {
         if (!s->io.registered)
                 return;
 
-        r = epoll_ctl(s->event->epoll_fd, EPOLL_CTL_DEL, s->io.fd, NULL);
-        if (r < 0)
-                log_debug_errno(errno, "Failed to remove source %s (type %s) from epoll: %m",
+        if (epoll_ctl(s->event->epoll_fd, EPOLL_CTL_DEL, s->io.fd, NULL) < 0)
+                log_debug_errno(errno, "Failed to remove source %s (type %s) from epoll, ignoring: %m",
                                 strna(s->description), event_source_type_to_string(s->type));
 
         s->io.registered = false;