From owner-svn-src-stable-11@freebsd.org Thu Mar 30 20:13:49 2017 Return-Path: Delivered-To: svn-src-stable-11@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 03A1AD26B20; Thu, 30 Mar 2017 20:13:49 +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 ADB88D30; Thu, 30 Mar 2017 20:13:48 +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 v2UKDl2Q050316; Thu, 30 Mar 2017 20:13:47 GMT (envelope-from dchagin@FreeBSD.org) Received: (from dchagin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2UKDlkX050315; Thu, 30 Mar 2017 20:13:47 GMT (envelope-from dchagin@FreeBSD.org) Message-Id: <201703302013.v2UKDlkX050315@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dchagin set sender to dchagin@FreeBSD.org using -f From: Dmitry Chagin Date: Thu, 30 Mar 2017 20:13:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r316301 - stable/11/sys/compat/linux X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Mar 2017 20:13:49 -0000 Author: dchagin Date: Thu Mar 30 20:13:47 2017 New Revision: 316301 URL: https://svnweb.freebsd.org/changeset/base/316301 Log: MFC r314403: Linux epoll return ENOENT error in case when op is EPOLL_CTL_MOD or EPOLL_CTL_DEL, and fd is not registered with this epoll instance. 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:12:23 2017 (r316300) +++ stable/11/sys/compat/linux/linux_event.c Thu Mar 30 20:13:47 2017 (r316301) @@ -483,11 +483,6 @@ linux_epoll_ctl(struct thread *td, struc switch (args->op) { case LINUX_EPOLL_CTL_MOD: - /* - * We don't memorize which events were set for this FD - * on this level, so just delete all we could have set: - * EVFILT_READ and EVFILT_WRITE, ignoring any errors - */ error = epoll_delete_all_events(td, epfp, args->fd); if (error != 0) goto leave0; @@ -644,19 +639,11 @@ epoll_delete_event(struct thread *td, st struct kevent_copyops k_ops = { &ciargs, NULL, epoll_kev_copyin}; - int error; ciargs.changelist = &kev; EV_SET(&kev, fd, filter, EV_DELETE | EV_DISABLE, 0, 0, 0); - error = kern_kevent_fp(td, epfp, 1, 0, &k_ops, NULL); - - /* - * here we ignore ENONT, because we don't keep track of events here - */ - if (error == ENOENT) - error = 0; - return (error); + return (kern_kevent_fp(td, epfp, 1, 0, &k_ops, NULL)); } static int @@ -667,8 +654,8 @@ epoll_delete_all_events(struct thread *t error1 = epoll_delete_event(td, epfp, fd, EVFILT_READ); error2 = epoll_delete_event(td, epfp, fd, EVFILT_WRITE); - /* report any errors we got */ - return (error1 == 0 ? error2 : error1); + /* return 0 if at least one result positive */ + return (error1 == 0 ? 0 : error2); } static int