From owner-svn-src-all@FreeBSD.ORG  Fri Jan  8 22:13:15 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 E46A6106566B;
	Fri,  8 Jan 2010 22:13:15 +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 D3BD18FC12;
	Fri,  8 Jan 2010 22:13:15 +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 o08MDFsb007006;
	Fri, 8 Jan 2010 22:13:15 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o08MDFvH007004;
	Fri, 8 Jan 2010 22:13:15 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201001082213.o08MDFvH007004@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 8 Jan 2010 22:13:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201838 - stable/7/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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jan 2010 22:13:16 -0000

Author: brooks
Date: Fri Jan  8 22:13:15 2010
New Revision: 201838
URL: http://svn.freebsd.org/changeset/base/201838

Log:
  MFC r201352
    If a filter has already been added, actually return EEXIST when trying
    at add it again.

Modified:
  stable/7/sys/kern/kern_event.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/kern/kern_event.c
==============================================================================
--- stable/7/sys/kern/kern_event.c	Fri Jan  8 22:08:18 2010	(r201837)
+++ stable/7/sys/kern/kern_event.c	Fri Jan  8 22:13:15 2010	(r201838)
@@ -757,6 +757,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",
@@ -773,7 +774,7 @@ kqueue_add_filteropts(int filt, struct f
 	}
 	mtx_unlock(&filterops_lock);
 
-	return (0);
+	return (error);
 }
 
 int