From 015c1b15a14f886f7948426e8725c3189c7fd1bd Mon Sep 17 00:00:00 2001 From: Davide Libenzi Date: Mon, 10 Apr 2006 22:54:12 -0700 Subject: [PATCH] --- yaml --- r: 25512 b: refs/heads/master c: 2395140ee2bffe38b1c8a59318f62882b797f5e6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/eventpoll.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 521b7c8e0bba..b64ff3f0033c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f6c840d774d669baf4727c0499ab0674826429f +refs/heads/master: 2395140ee2bffe38b1c8a59318f62882b797f5e6 diff --git a/trunk/fs/eventpoll.c b/trunk/fs/eventpoll.c index 242fe1a66ce5..1b4491cdd115 100644 --- a/trunk/fs/eventpoll.c +++ b/trunk/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;