From owner-svn-src-all@FreeBSD.ORG Fri Jan 8 21:58:13 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0AD3C106568B; Fri, 8 Jan 2010 21:58:13 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EE30E8FC15; Fri, 8 Jan 2010 21:58:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o08LwCS8003301; Fri, 8 Jan 2010 21:58:12 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o08LwCjc003299; Fri, 8 Jan 2010 21:58:12 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201001082158.o08LwCjc003299@svn.freebsd.org> From: Brooks Davis Date: Fri, 8 Jan 2010 21:58:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r201835 - stable/8/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2010 21:58:13 -0000 Author: brooks Date: Fri Jan 8 21:58:12 2010 New Revision: 201835 URL: http://svn.freebsd.org/changeset/base/201835 Log: MFC r201352 If a filter has already been added, actually return EEXIST when trying at add it again. Modified: stable/8/sys/kern/kern_event.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/kern/kern_event.c ============================================================================== --- stable/8/sys/kern/kern_event.c Fri Jan 8 21:55:44 2010 (r201834) +++ stable/8/sys/kern/kern_event.c Fri Jan 8 21:58:12 2010 (r201835) @@ -852,6 +852,7 @@ kqueue_add_filteropts(int filt, struct f { int error; + error = 0; if (filt > 0 || filt + EVFILT_SYSCOUNT < 0) { printf( "trying to add a filterop that is out of range: %d is beyond %d\n", @@ -868,7 +869,7 @@ kqueue_add_filteropts(int filt, struct f } mtx_unlock(&filterops_lock); - return (0); + return (error); } int