Date: Thu, 30 Mar 2017 20:12:23 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r316300 - stable/11/sys/compat/linux Message-ID: <201703302012.v2UKCNQ8050221@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dchagin Date: Thu Mar 30 20:12:23 2017 New Revision: 316300 URL: https://svnweb.freebsd.org/changeset/base/316300 Log: MFC r314402: FreeBSD does not have analgue for epoll EPOLLPRI event type. So, do not set EPOLLPRI event acidently. Also, do not set EPOLLWRNORM and EPOLLRDNORM events as epoll do not set this events. Modified: stable/11/sys/compat/linux/linux_event.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/compat/linux/linux_event.c ============================================================================== --- stable/11/sys/compat/linux/linux_event.c Thu Mar 30 20:10:57 2017 (r316299) +++ stable/11/sys/compat/linux/linux_event.c Thu Mar 30 20:12:23 2017 (r316300) @@ -357,14 +357,15 @@ kevent_to_epoll(struct kevent *kevent, s return; } + /* XXX EPOLLPRI, EPOLLHUP */ switch (kevent->filter) { case EVFILT_READ: - l_event->events = LINUX_EPOLLIN|LINUX_EPOLLRDNORM|LINUX_EPOLLPRI; + l_event->events = LINUX_EPOLLIN; if ((kevent->flags & EV_EOF) != 0) l_event->events |= LINUX_EPOLLRDHUP; break; case EVFILT_WRITE: - l_event->events = LINUX_EPOLLOUT|LINUX_EPOLLWRNORM; + l_event->events = LINUX_EPOLLOUT; break; } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703302012.v2UKCNQ8050221>