diff options
| author | Avi Kivity <avi@scylladb.com> | 2018-06-08 21:12:32 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-06-15 02:07:38 +0200 |
| commit | 4d572d9f46507be8cfe326aa5bc3698babcbdfa7 (patch) | |
| tree | dc24bf35b539ea641b700344820c84462751bfd7 /fs | |
| parent | aio: mark __aio_sigset::sigmask const (diff) | |
| download | linux-4d572d9f46507be8cfe326aa5bc3698babcbdfa7.tar.xz linux-4d572d9f46507be8cfe326aa5bc3698babcbdfa7.zip | |
eventfd: only return events requested in poll_mask()
The ->poll_mask() operation has a mask of events that the caller
is interested in, but we're returning all events regardless.
Change to return only the events the caller is interested in. This
fixes aio IO_CMD_POLL returning immediately when called with POLLIN
on an eventfd, since an eventfd is almost always ready for a write.
Signed-off-by: Avi Kivity <avi@scylladb.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/eventfd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/eventfd.c b/fs/eventfd.c index 61c9514da5e9..ceb1031f1cac 100644 --- a/fs/eventfd.c +++ b/fs/eventfd.c @@ -156,11 +156,11 @@ static __poll_t eventfd_poll_mask(struct file *file, __poll_t eventmask) count = READ_ONCE(ctx->count); if (count > 0) - events |= EPOLLIN; + events |= (EPOLLIN & eventmask); if (count == ULLONG_MAX) events |= EPOLLERR; if (ULLONG_MAX - 1 > count) - events |= EPOLLOUT; + events |= (EPOLLOUT & eventmask); return events; } |