From owner-svn-src-head@FreeBSD.ORG Thu Dec 31 20:56:28 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBB921065670; Thu, 31 Dec 2009 20:56:28 +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 DBEC78FC20; Thu, 31 Dec 2009 20:56:28 +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 nBVKuSZ4006453; Thu, 31 Dec 2009 20:56:28 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBVKuSDS006451; Thu, 31 Dec 2009 20:56:28 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <200912312056.nBVKuSDS006451@svn.freebsd.org> From: Brooks Davis Date: Thu, 31 Dec 2009 20:56:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r201352 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Dec 2009 20:56:29 -0000 Author: brooks Date: Thu Dec 31 20:56:28 2009 New Revision: 201352 URL: http://svn.freebsd.org/changeset/base/201352 Log: If a filter has already been added, actually return EEXIST when trying at add it again. MFC after: 1 week Modified: head/sys/kern/kern_event.c Modified: head/sys/kern/kern_event.c ============================================================================== --- head/sys/kern/kern_event.c Thu Dec 31 20:44:38 2009 (r201351) +++ head/sys/kern/kern_event.c Thu Dec 31 20:56:28 2009 (r201352) @@ -867,6 +867,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", @@ -883,7 +884,7 @@ kqueue_add_filteropts(int filt, struct f } mtx_unlock(&filterops_lock); - return (0); + return (error); } int