From owner-svn-src-user@FreeBSD.ORG Sat May 10 09:17:45 2014 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E3DB99F6; Sat, 10 May 2014 09:17:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D1900859; Sat, 10 May 2014 09:17:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4A9HjZr013656; Sat, 10 May 2014 09:17:45 GMT (envelope-from dchagin@svn.freebsd.org) Received: (from dchagin@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4A9HjLs013655; Sat, 10 May 2014 09:17:45 GMT (envelope-from dchagin@svn.freebsd.org) Message-Id: <201405100917.s4A9HjLs013655@svn.freebsd.org> From: Dmitry Chagin Date: Sat, 10 May 2014 09:17:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r265812 - user/dchagin/lemul/sys/compat/linux X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2014 09:17:46 -0000 Author: dchagin Date: Sat May 10 09:17:45 2014 New Revision: 265812 URL: http://svnweb.freebsd.org/changeset/base/265812 Log: Fix a bug in epoll_delete_event. fd parameter of the kern_kevent should be kqueue file descriptor not an ident file descriptor. Modified: user/dchagin/lemul/sys/compat/linux/linux_event.c Modified: user/dchagin/lemul/sys/compat/linux/linux_event.c ============================================================================== --- user/dchagin/lemul/sys/compat/linux/linux_event.c Sat May 10 08:48:04 2014 (r265811) +++ user/dchagin/lemul/sys/compat/linux/linux_event.c Sat May 10 09:17:45 2014 (r265812) @@ -474,8 +474,8 @@ epoll_delete_event(struct thread *td, st ciargs.changelist = &kev; EV_SET(&kev, fd, filter, EV_DELETE | EV_DISABLE, 0, 0, 0); - - error = kern_kevent(td, fd, 1, 0, &k_ops, NULL); + + error = kern_kevent_fp(td, epfp, 1, 0, &k_ops, NULL); /* * here we ignore ENONT, because we don't keep track of events here