| Message ID | 20180617083141.26543-1-avi@scylladb.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Jun 17, 2018 at 11:31:41AM +0300, Avi Kivity wrote: > This reverts commit 4d572d9f46507be8cfe326aa5bc3698babcbdfa7. It is > superceded by the more general > 2739b807b0885a09996659be82f813af219c7360 ("aio: only return events > requested in poll_mask() for IOCB_CMD_POLL"). Unfortunately, hch > nacked it on the bug report rather than on the patch itself, so it > was picked up. Note that even with that patch this patch is harmless, although indeed not actually needed.
diff --git a/fs/eventfd.c b/fs/eventfd.c index ceb1031f1cac..61c9514da5e9 100644 --- a/fs/eventfd.c +++ b/fs/eventfd.c @@ -154,15 +154,15 @@ static __poll_t eventfd_poll_mask(struct file *file, __poll_t eventmask) * eventfd_poll returns 0 */ count = READ_ONCE(ctx->count); if (count > 0) - events |= (EPOLLIN & eventmask); + events |= EPOLLIN; if (count == ULLONG_MAX) events |= EPOLLERR; if (ULLONG_MAX - 1 > count) - events |= (EPOLLOUT & eventmask); + events |= EPOLLOUT; return events; } static void eventfd_ctx_do_read(struct eventfd_ctx *ctx, __u64 *cnt)
This reverts commit 4d572d9f46507be8cfe326aa5bc3698babcbdfa7. It is superceded by the more general 2739b807b0885a09996659be82f813af219c7360 ("aio: only return events requested in poll_mask() for IOCB_CMD_POLL"). Unfortunately, hch nacked it on the bug report rather than on the patch itself, so it was picked up. --- fs/eventfd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)