From owner-svn-src-projects@FreeBSD.ORG  Tue Jun  1 14:50:01 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0DECB106564A;
	Tue,  1 Jun 2010 14:50:01 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F17308FC0C;
	Tue,  1 Jun 2010 14:50:00 +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 o51Eo0AZ061969;
	Tue, 1 Jun 2010 14:50:00 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o51Eo0sF061967;
	Tue, 1 Jun 2010 14:50:00 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201006011450.o51Eo0sF061967@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 1 Jun 2010 14:50:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208706 - projects/capabilities8/lib/libcapsicum
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jun 2010 14:50:01 -0000

Author: rwatson
Date: Tue Jun  1 14:50:00 2010
New Revision: 208706
URL: http://svn.freebsd.org/changeset/base/208706

Log:
  Merge 177190 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Remove unneeded count==0 check in libcapsicum.
  
  Submitted by:	jona

Modified:
  projects/capabilities8/lib/libcapsicum/libcapsicum_fdlist.c

Modified: projects/capabilities8/lib/libcapsicum/libcapsicum_fdlist.c
==============================================================================
--- projects/capabilities8/lib/libcapsicum/libcapsicum_fdlist.c	Tue Jun  1 14:47:46 2010	(r208705)
+++ projects/capabilities8/lib/libcapsicum/libcapsicum_fdlist.c	Tue Jun  1 14:50:00 2010	(r208706)
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#10 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#11 $
  */
 
 #include <sys/mman.h>
@@ -467,12 +467,6 @@ lc_fdlist_reorder(struct lc_fdlist *lfp)
 	LOCK(lfp);
 	lfsp = lfp->lf_storage;
 
-	/* Do we really need to do this? */
-	if (lfsp->count == 0) {
-		UNLOCK(lfp);
-		return (0);
-	}
-
 	/*
 	 * Identify the highest source file descriptor we care about so that
 	 * when we play the dup2() rearranging game, we don't overwrite any