PERFORCE change 70531 for review

[John Baldwin]

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

Change 70531 by jhb at 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) {