From owner-svn-src-head@freebsd.org  Tue Feb 28 19:49:22 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A634DCF1ED3;
 Tue, 28 Feb 2017 19:49:22 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 75CDA214;
 Tue, 28 Feb 2017 19:49:22 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1SJnLOA007714;
 Tue, 28 Feb 2017 19:49:21 GMT (envelope-from dchagin@FreeBSD.org)
Received: (from dchagin@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1SJnLTC007713;
 Tue, 28 Feb 2017 19:49:21 GMT (envelope-from dchagin@FreeBSD.org)
Message-Id: <201702281949.v1SJnLTC007713@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dchagin set sender to
 dchagin@FreeBSD.org using -f
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Tue, 28 Feb 2017 19:49:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314402 - head/sys/compat/linux
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Feb 2017 19:49:22 -0000

Author: dchagin
Date: Tue Feb 28 19:49:21 2017
New Revision: 314402
URL: https://svnweb.freebsd.org/changeset/base/314402

Log:
  FreeBSD does not have analgue for epill 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.
  
  MFC after:	1 month

Modified:
  head/sys/compat/linux/linux_event.c

Modified: head/sys/compat/linux/linux_event.c
==============================================================================
--- head/sys/compat/linux/linux_event.c	Tue Feb 28 19:32:45 2017	(r314401)
+++ head/sys/compat/linux/linux_event.c	Tue Feb 28 19:49:21 2017	(r314402)
@@ -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;
 	}
 }