From a2e37a325bbb954f3a394dc9c59221a3472d7b69 Mon Sep 17 00:00:00 2001 From: Davide Libenzi Date: Wed, 15 Oct 2008 22:01:56 -0700 Subject: [PATCH] --- yaml --- r: 114727 b: refs/heads/master c: f337b9c58332bdecde965b436e47ea4c94d30da0 h: refs/heads/master i: 114725: d152f200b55ed548df9a84ddcf4446623af8a10b 114723: 87e000730022b6d1d68f9d968f9757af28f1552e 114719: 136de6280b984d252e6197b7a09bb3d72c2cc9ab v: v3 --- [refs] | 2 +- trunk/fs/eventpoll.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index afaf3ea4f2ce..6ca418ae957f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b6e47ad062e6ac993fb80256344fc499c1e827b +refs/heads/master: f337b9c58332bdecde965b436e47ea4c94d30da0 diff --git a/trunk/fs/eventpoll.c b/trunk/fs/eventpoll.c index 7cc0eb756b55..99368bda0261 100644 --- a/trunk/fs/eventpoll.c +++ b/trunk/fs/eventpoll.c @@ -927,14 +927,11 @@ static int ep_send_events(struct eventpoll *ep, struct epoll_event __user *event /* * During the time we spent in the loop above, some other events * might have been queued by the poll callback. We re-insert them - * here (in case they are not already queued, or they're one-shot). + * inside the main ready-list here. */ for (nepi = ep->ovflist; (epi = nepi) != NULL; - nepi = epi->next, epi->next = EP_UNACTIVE_PTR) { - if (!ep_is_linked(&epi->rdllink) && - (epi->event.events & ~EP_PRIVATE_BITS)) - list_add_tail(&epi->rdllink, &ep->rdllist); - } + nepi = epi->next, epi->next = EP_UNACTIVE_PTR) + list_add_tail(&epi->rdllink, &ep->rdllist); /* * We need to set back ep->ovflist to EP_UNACTIVE_PTR, so that after * releasing the lock, events will be queued in the normal way inside