---

yaml
---
r: 114727
b: refs/heads/master
c: f337b9c
h: refs/heads/master
i:
  114725: d152f20
  114723: 87e0007
  114719: 136de62
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b6e47ad062e6ac993fb80256344fc499c1e827b
+refs/heads/master: f337b9c58332bdecde965b436e47ea4c94d30da0

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