Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/vfs_lookup.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/vfs_lookup.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.54.4.1
retrieving revision 1.55
diff -u -p -r1.54.4.1 -r1.55
--- src/sys/kern/vfs_lookup.c	2005/03/16 12:59:07	1.54.4.1
+++ src/sys/kern/vfs_lookup.c	2004/09/17 14:11:25	1.55
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_lookup.c,v 1.54.4.1 2005/03/16 12:59:07 tron Exp $	*/
+/*	$NetBSD: vfs_lookup.c,v 1.55 2004/09/17 14:11:25 skrll Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.54.4.1 2005/03/16 12:59:07 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.55 2004/09/17 14:11:25 skrll Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_systrace.h"
@@ -206,7 +206,7 @@ namei(ndp)
 		auio.uio_offset = 0;
 		auio.uio_rw = UIO_READ;
 		auio.uio_segflg = UIO_SYSSPACE;
-		auio.uio_procp = (struct proc *)0;
+		auio.uio_procp = NULL;
 		auio.uio_resid = MAXPATHLEN;
 		error = VOP_READLINK(ndp->ni_vp, &auio, cnp->cn_cred);
 		if (error) {
@@ -528,9 +528,6 @@ unionlookup:
 			goto unionlookup;
 		}
 
-		if (cnp->cn_flags & PDIRUNLOCK)
-			dpunlocked = 1;
-
 		if (error != EJUSTRETURN)
 			goto bad;
 		/*