From owner-trustedbsd-cvs@FreeBSD.ORG  Tue Nov 14 20:52:00 2006
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 [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EB6B616A4E6
	for <trustedbsd-cvs@freebsd.org>; Tue, 14 Nov 2006 20:51:59 +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 086EE43FCD
	for <trustedbsd-cvs@freebsd.org>; Tue, 14 Nov 2006 20:45:46 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
	by cyrus.watson.org (Postfix) with ESMTP id 3D18346D87
	for <trustedbsd-cvs@trustedbsd.org>;
	Tue, 14 Nov 2006 15:45:46 -0500 (EST)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id 7C2125709C;
	Tue, 14 Nov 2006 20:44:26 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7699D16A4EC; Tue, 14 Nov 2006 20:44:26 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5522616A492
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 20:44:26 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4278343F3F
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 20:38:39 +0000 (GMT)
	(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 kAEKcc9t047760
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 20:38:38 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAEKccmd047757
	for perforce@freebsd.org; Tue, 14 Nov 2006 20:38:38 GMT
	(envelope-from millert@freebsd.org)
Date: Tue, 14 Nov 2006 20:38:38 GMT
Message-Id: <200611142038.kAEKccmd047757@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 109984 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: Tue, 14 Nov 2006 20:52:00 -0000

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

Change 109984 by millert@millert_g5tower on 2006/11/14 20:37:41

	Fix merge error; remove stray vnode_unlock() call.
	g/c unused vars

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#20 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#20 (text+ko) ====

@@ -254,9 +254,7 @@
 {
 	struct devnode *dnp;
 	struct fdescnode *fnp;
-	struct fileglob *fg;
-	struct proc *p;
-	int error, fd;
+	int error;
 
 	error = 0;
 
@@ -1005,7 +1003,6 @@
 		MAC_PERFORM(vnode_label_associate_posixsem,
 		    vfs_context_ucred(ctx), psem, psem->psem_label,
 		    vp, vp->v_label);
-		vnode_unlock(vp);
 		break;
 	case DTYPE_PIPE:
 		/* XXX: should PIPE_LOCK */