summaryrefslogtreecommitdiffstats
path: root/fs/eventpoll.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2017-11-28 19:56:15 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2017-11-28 19:56:15 -0500
commit69112736e2f025ff3ba280cf81c36e25cf7cc59f (patch)
tree753f63276600b58d2ebdb2b4b240db3b381e4936 /fs/eventpoll.c
parentbec1a502d34dcd4d4350a4d9c14fe07561c9516d (diff)
downloadlinux-69112736e2f025ff3ba280cf81c36e25cf7cc59f.tar.gz
linux-69112736e2f025ff3ba280cf81c36e25cf7cc59f.tar.bz2
linux-69112736e2f025ff3ba280cf81c36e25cf7cc59f.zip
eventpoll: no need to mask the result of epi_item_poll() again
two callers that do so don't need to bother - we'd already masked it with epi->event.events, which * couldn't have changed since we are holding ->mtx * had been set to event->events * is still equal to event->events, since *event is never changed by anything. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/eventpoll.c')
-rw-r--r--fs/eventpoll.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index 92f6c30a1dbb..42e35a6977c9 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -1488,7 +1488,7 @@ static int ep_insert(struct eventpoll *ep, const struct epoll_event *event,
ep_set_busy_poll_napi_id(epi);
/* If the file is already "ready" we drop it inside the ready list */
- if ((revents & event->events) && !ep_is_linked(&epi->rdllink)) {
+ if (revents && !ep_is_linked(&epi->rdllink)) {
list_add_tail(&epi->rdllink, &ep->rdllist);
ep_pm_stay_awake(epi);
@@ -1546,7 +1546,6 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi,
const struct epoll_event *event)
{
int pwake = 0;
- unsigned int revents;
poll_table pt;
init_poll_funcptr(&pt, NULL);
@@ -1588,14 +1587,10 @@ static int ep_modify(struct eventpoll *ep, struct epitem *epi,
/*
* Get current event bits. We can safely use the file* here because
* its usage count has been increased by the caller of this function.
- */
- revents = ep_item_poll(epi, &pt, 1);
-
- /*
* If the item is "hot" and it is not registered inside the ready
* list, push it inside.
*/
- if (revents & event->events) {
+ if (ep_item_poll(epi, &pt, 1)) {
spin_lock_irq(&ep->lock);
if (!ep_is_linked(&epi->rdllink)) {
list_add_tail(&epi->rdllink, &ep->rdllist);