From owner-p4-projects@FreeBSD.ORG  Mon Feb  7 18:23:45 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4D01016A4EE; Mon,  7 Feb 2005 18:23:45 +0000 (GMT)
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 291B616A4D8
	for <perforce@freebsd.org>; Mon,  7 Feb 2005 18:23:45 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0FD4643D3F
	for <perforce@freebsd.org>; Mon,  7 Feb 2005 18:23:45 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j17INiud031568
	for <perforce@freebsd.org>; Mon, 7 Feb 2005 18:23:44 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j17INi0w031565
	for perforce@freebsd.org; Mon, 7 Feb 2005 18:23:44 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 7 Feb 2005 18:23:44 GMT
Message-Id: <200502071823.j17INi0w031565@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 70531 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: Mon, 07 Feb 2005 18:23:45 -0000

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

Change 70531 by jhb@jhb_slimer on 2005/02/07 18:23:15

	IFC this file.

Affected files ...

.. //depot/projects/smpng/sys/kern/vfs_syscalls.c#82 integrate

Differences ...

==== //depot/projects/smpng/sys/kern/vfs_syscalls.c#82 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.368 2005/01/25 00:39:00 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.370 2005/02/02 17:17:15 jeff Exp $");
 
 #include "opt_compat.h"
 #include "opt_mac.h"
@@ -2082,7 +2082,7 @@
 	NDINIT(&nd, LOOKUP, FOLLOW | LOCKSHARED | LOCKLEAF | NOOBJ | MPSAFE,
 	    UIO_USERSPACE, uap->path, td);
 #else
-	NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | NOOBJ, UIO_USERSPACE | MPSAFE,
+	NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | NOOBJ | MPSAFE, UIO_USERSPACE,
 	    uap->path, td);
 #endif
 	if ((error = namei(&nd)) != 0)
@@ -3266,7 +3266,7 @@
 		vrele(fvp);
 		goto out1;
 	}
-	tvfslocked = NDHASGIANT(&fromnd);
+	tvfslocked = NDHASGIANT(&tond);
 	tdvp = tond.ni_dvp;
 	tvp = tond.ni_vp;
 	if (tvp != NULL) {