From: Haomai Wang <haomai@xsky.com>
Date: Fri, 17 Jun 2016 13:41:08 +0000 (+0800)
Subject: msg/async/Epoll: make sure error event can be handle
X-Git-Tag: ses5-milestone5~575^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a20a6a2d54844a77eb6645028b3e1ce252488cd;p=ceph.git

msg/async/Epoll: make sure error event can be handle

Signed-off-by: Haomai Wang <haomai@xsky.com>
---

diff --git a/src/msg/async/EventEpoll.cc b/src/msg/async/EventEpoll.cc
index 86e8c9ab8288..ef478eb11f84 100644
--- a/src/msg/async/EventEpoll.cc
+++ b/src/msg/async/EventEpoll.cc
@@ -123,8 +123,8 @@ int EpollDriver::event_wait(vector<FiredFileEvent> &fired_events, struct timeval
 
       if (e->events & EPOLLIN) mask |= EVENT_READABLE;
       if (e->events & EPOLLOUT) mask |= EVENT_WRITABLE;
-      if (e->events & EPOLLERR) mask |= EVENT_WRITABLE;
-      if (e->events & EPOLLHUP) mask |= EVENT_WRITABLE;
+      if (e->events & EPOLLERR) mask |= EVENT_READABLE|EVENT_WRITABLE;
+      if (e->events & EPOLLHUP) mask |= EVENT_READABLE|EVENT_WRITABLE;
       fired_events[j].fd = e->data.fd;
       fired_events[j].mask = mask;
     }