From owner-p4-projects@FreeBSD.ORG  Tue Jun 10 21:11:49 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EF9F6106567F; Tue, 10 Jun 2008 21:11:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B2096106566B
	for <perforce@freebsd.org>; Tue, 10 Jun 2008 21:11:48 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A2CB58FC12
	for <perforce@freebsd.org>; Tue, 10 Jun 2008 21:11:48 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5ALBmd1058533
	for <perforce@freebsd.org>; Tue, 10 Jun 2008 21:11:48 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5ALBmBG058531
	for perforce@freebsd.org; Tue, 10 Jun 2008 21:11:48 GMT
	(envelope-from julian@freebsd.org)
Date: Tue, 10 Jun 2008 21:11:48 GMT
Message-Id: <200806102111.m5ALBmBG058531@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 143260 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jun 2008 21:11:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=143260

Change 143260 by julian@julian_trafmon1 on 2008/06/10 21:11:16

	 IFC@143258

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/kern/uipc_sem.c#2 integrate

Differences ...

==== //depot/projects/vimage-commit2/src/sys/kern/uipc_sem.c#2 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_sem.c,v 1.31 2008/05/16 18:10:07 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_sem.c,v 1.32 2008/06/10 20:55:10 gonzo Exp $");
 
 #include "opt_mac.h"
 #include "opt_posix.h"
@@ -221,14 +221,13 @@
 		sem_enter(td->td_proc, ret);
 	*ksret = ret;
 	mtx_lock(&sem_lock);
-	if (nsems >= p31b_getcfg(CTL_P1003_1B_SEM_NSEMS_MAX)) {
+	nsems++;
+	if (nsems > p31b_getcfg(CTL_P1003_1B_SEM_NSEMS_MAX)) {
 		sem_leave(td->td_proc, ret);
 		sem_free(ret);
 		error = ENFILE;
-	} else {
-		nsems++;
+	} else
 		error = 0;
-	}
 	mtx_unlock(&sem_lock);
 	return (error);
 }