diff options
| author | Davide Libenzi <davidel@xmailserver.org> | 2006-04-10 22:54:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 06:18:42 -0700 |
| commit | 2395140ee2bffe38b1c8a59318f62882b797f5e6 (patch) | |
| tree | b8e8f6d6db2f1aa417bb32b8a5a376d0c0a478b2 | |
| parent | 0f6c840d774d669baf4727c0499ab0674826429f (diff) | |
| download | kernel_samsung_crespo-2395140ee2bffe38b1c8a59318f62882b797f5e6.zip kernel_samsung_crespo-2395140ee2bffe38b1c8a59318f62882b797f5e6.tar.gz kernel_samsung_crespo-2395140ee2bffe38b1c8a59318f62882b797f5e6.tar.bz2 | |
[PATCH] uniform POLLRDHUP handling between epoll and poll/select
As reported by Michael Kerrisk, POLLRDHUP handling was not consistent
between epoll and poll/select, since in epoll it was unmaskeable. This
patch brings uniformity in POLLRDHUP handling.
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | fs/eventpoll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index 242fe1a..1b4491c 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c @@ -599,7 +599,7 @@ sys_epoll_ctl(int epfd, int op, int fd, struct epoll_event __user *event) switch (op) { case EPOLL_CTL_ADD: if (!epi) { - epds.events |= POLLERR | POLLHUP | POLLRDHUP; + epds.events |= POLLERR | POLLHUP; error = ep_insert(ep, &epds, tfile, fd); } else @@ -613,7 +613,7 @@ sys_epoll_ctl(int epfd, int op, int fd, struct epoll_event __user *event) break; case EPOLL_CTL_MOD: if (epi) { - epds.events |= POLLERR | POLLHUP | POLLRDHUP; + epds.events |= POLLERR | POLLHUP; error = ep_modify(ep, epi, &epds); } else error = -ENOENT; |