From owner-trustedbsd-cvs@FreeBSD.ORG  Mon Jan 22 16:32:38 2007
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D988916A400
	for <trustedbsd-cvs@freebsd.org>; Mon, 22 Jan 2007 16:32:38 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.freebsd.org (Postfix) with ESMTP id 699B913C4A6
	for <trustedbsd-cvs@freebsd.org>; Mon, 22 Jan 2007 16:32:38 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53])
	by cyrus.watson.org (Postfix) with ESMTP id DD46C492BA
	for <trustedbsd-cvs@trustedbsd.org>;
	Mon, 22 Jan 2007 11:32:36 -0500 (EST)
Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54])
	by mx2.freebsd.org (Postfix) with ESMTP id 2985B5C54A;
	Mon, 22 Jan 2007 16:32:34 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2220C16A409; Mon, 22 Jan 2007 16:32:34 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 000F116A406
	for <perforce@freebsd.org>; Mon, 22 Jan 2007 16:32:33 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id C330B13C4C6
	for <perforce@freebsd.org>; Mon, 22 Jan 2007 16:32:33 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0MGWXCI033080
	for <perforce@freebsd.org>; Mon, 22 Jan 2007 16:32:33 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGWXCA033075
	for perforce@freebsd.org; Mon, 22 Jan 2007 16:32:33 GMT
	(envelope-from millert@freebsd.org)
Date: Mon, 22 Jan 2007 16:32:33 GMT
Message-Id: <200701221632.l0MGWXCA033075@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 113370 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Jan 2007 16:32:38 -0000

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

Change 113370 by millert@millert_macbook on 2007/01/22 16:32:32

	Fix mis-merge in @113355.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#12 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.c#12 (text+ko) ====

@@ -162,8 +162,7 @@
 		return (old);
 	lh = labelh_duplicate(old);
 	lh_release(old);
-	if (!keepold)
-		lh_check_unlock(old);
+	lh_check_unlock(old);
 	lh_lock(lh);
 	return (lh);
 }