diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-11-23 11:39:40 +0100 |
|---|---|---|
| committer | The Plumber <50238977+systemd-rhel-bot@users.noreply.github.com> | 2021-03-10 12:41:30 +0100 |
| commit | e8904b5b7957bfc9328f1ab8b6851c7b0d8920c9 (patch) | |
| tree | 90ba509b2d53b623704a10607d064103fba94e2c | |
| parent | d7ad6ad123200f562081ff09f7bed3c6d969ac0a (diff) | |
| download | systemd-e8904b5b7957bfc9328f1ab8b6851c7b0d8920c9.tar.gz | |
sd-event: mention that two debug logged events are ignored
(cherry picked from commit f80a5d6a86dc2346f406ee086ba179879afaab70)
Related: #1819868
| -rw-r--r-- | src/libsystemd/sd-event/sd-event.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index df5ed0dce8..0f507f18d8 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -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; |