From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 10 Nov 2015 20:04:39 +0000 (+0100)
Subject: journald: be less picky when receiving epoll events
X-Git-Tag: v228~59^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17afc8f27b7850ca479f0c3720680b90881d8e6e;p=thirdparty%2Fsystemd.git

journald: be less picky when receiving epoll events

The event might be flagged with stuff we don't expect, hence don't
be needlessly picky, just rely on the kernel passing us sensible events.
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 36fe739073e..a6e5e4a20fb 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1484,11 +1484,6 @@ static int dispatch_notify_event(sd_event_source *es, int fd, uint32_t revents,
         assert(s->notify_event_source == es);
         assert(s->notify_fd == fd);
 
-        if (revents != EPOLLOUT) {
-                log_error("Invalid events on notify file descriptor.");
-                return -EINVAL;
-        }
-
         /* The $NOTIFY_SOCKET is writable again, now send exactly one
          * message on it. Either it's the wtachdog event, the initial
          * READY=1 event or an stdout stream event. If there's nothing