From owner-p4-projects@FreeBSD.ORG  Wed Nov 12 14:28:24 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4B92016A4D2; Wed, 12 Nov 2003 14:28:24 -0800 (PST)
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 19E6716A4CE
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 14:28:24 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7C75943FCB
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 14:28:23 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hACMSNXJ026994
	for <perforce@freebsd.org>; Wed, 12 Nov 2003 14:28:23 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hACMSMSI026991
	for perforce@freebsd.org; Wed, 12 Nov 2003 14:28:22 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 12 Nov 2003 14:28:22 -0800 (PST)
Message-Id: <200311122228.hACMSMSI026991@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42174 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 12 Nov 2003 22:28:24 -0000

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

Change 42174 by rwatson@rwatson_tislabs on 2003/11/12 14:28:05

	Slide Giant a little more, whitespace synchronization to the
	version committed to the main FreeBSD source tree.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#433 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#433 (text+ko) ====

@@ -553,6 +553,9 @@
 	return (0);
 }
 
+/*
+ * MPSAFE
+ */
 int
 __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap)
 {
@@ -751,7 +754,6 @@
 	case DTYPE_FIFO:
 	case DTYPE_VNODE:
 		vp = fp->f_vnode;
-
 		intlabel = mac_vnode_label_alloc();
 		mtx_lock(&Giant);				/* VFS */
 		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
@@ -762,9 +764,9 @@
 		    buffer, mac.m_buflen);
 		mac_vnode_label_free(intlabel);
 		break;
+
 	case DTYPE_PIPE:
 		pipe = fp->f_data;
-
 		intlabel = mac_pipe_label_alloc();
 		PIPE_LOCK(pipe);
 		mac_copy_pipe_label(pipe->pipe_label, intlabel);
@@ -773,12 +775,14 @@
 		    buffer, mac.m_buflen);
 		mac_pipe_label_free(intlabel);
 		break;
+
 	default:
 		error = EINVAL;
 	}
 	fdrop(fp, td);
 	if (error == 0)
 		error = copyout(buffer, mac.m_string, strlen(buffer)+1);
+
 out:
 	free(buffer, M_MACTEMP);
 	free(elements, M_MACTEMP);
@@ -937,16 +941,14 @@
 			mac_vnode_label_free(intlabel);
 			break;
 		}
-
 		vp = fp->f_vnode;
 		mtx_lock(&Giant);				/* VFS */
 		error = vn_start_write(vp, &mp, V_WAIT | PCATCH);
 		if (error != 0) {
+			mtx_unlock(&Giant);			/* VFS */
 			mac_vnode_label_free(intlabel);
-			mtx_unlock(&Giant);			/* VFS */
 			break;
 		}
-
 		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 		error = vn_setlabel(vp, intlabel, td->td_ucred);
 		VOP_UNLOCK(vp, 0, td);