 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_lookup.c,v 1.117 2009/08/09 03:28:35 dholland Exp $	*/
+/*	$NetBSD: vfs_lookup.c,v 1.118 2009/08/09 07:27:54 dholland Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -27,27 +27,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)vfs_lookup.c	8.10 (Berkeley) 5/27/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.117 2009/08/09 03:28:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.118 2009/08/09 07:27:54 dholland Exp $");
 #include "opt_magiclinks.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/syslimits.h>
 #include <sys/time.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/errno.h>
 #include <sys/filedesc.h>
 @@ -214,51 +214,71 @@ symlink_magic(struct proc *p, char *cp,
  *	while (!done && !error) {
  *		call lookup to search path.
  *		if symbolic link, massage name in buffer and continue
  *	}
  */
 /*
  * Internal state for a namei operation.
  */
 struct namei_state {
 	struct nameidata *ndp;
 	struct componentname *cnp;
 	/* used by the pieces of namei */
 	struct vnode *namei_startdir; /* The directory namei() starts from. */
 	/* used by the pieces of lookup */
 	int lookup_alldone;
 	int docache;			/* == 0 do not cache last component */
 	int rdonly;			/* lookup read-only flag bit */
 	struct vnode *dp;		/* the directory we are searching */
 	int slashes;
 };
 /* XXX reorder things to make this decl unnecessary */
 static int do_lookup(struct namei_state *state);
 /*
  * Initialize the namei working state.
  */
 static void
 namei_init(struct namei_state *state, struct nameidata *ndp)
+{
 	state->ndp = ndp;
 	state->cnp = &ndp->ni_cnd;
 	state->namei_startdir = NULL;
 	state->lookup_alldone = 0;
 	state->docache = 0;
 	state->rdonly = 0;
 	state->dp = NULL;
 	state->slashes = 0;
+}
 /*
  * Clean up the working namei state, leaving things ready for return
  * from namei.
  */
 static void
 namei_cleanup(struct namei_state *state)
+{
 	KASSERT(state->cnp == &state->ndp->ni_cnd);
-	//KASSERT(state->dp == NULL); 	// not yet
+	//KASSERT(state->namei_startdir == NULL); 	// not yet
 	/* nothing for now */
 	(void)state;
+}
 //////////////////////////////
 /*
  * Start up namei. Early portion.
+ *
  * This is divided from namei_start2 by the emul_retry: point.
  */
 static void
 @@ -311,99 +331,99 @@ namei_start2(struct namei_state *state)
 	if (error) {
 		PNBUF_PUT(cnp->cn_pnbuf);
 		ndp->ni_vp = NULL;
 		return (error);
+	}
 	ndp->ni_loopcnt = 0;
 	/*
 	 * Get root directory for the translation.
 	 */
 	cwdi = self->l_proc->p_cwdi;
 	rw_enter(&cwdi->cwdi_lock, RW_READER);
-	state->dp = cwdi->cwdi_rdir;
+	state->namei_startdir = cwdi->cwdi_rdir;
-	if (state->dp == NULL)
+	if (state->namei_startdir == NULL)
-		state->dp = rootvnode;
+		state->namei_startdir = rootvnode;
-	ndp->ni_rootdir = state->dp;
+	ndp->ni_rootdir = state->namei_startdir;
 	/*
 	 * Check if starting from root directory or current directory.
 	 */
 	if (cnp->cn_pnbuf[0] == '/') {
 		if (cnp->cn_flags & TRYEMULROOT) {
 			if (cnp->cn_flags & EMULROOTSET) {
 				/* Called from (eg) emul_find_interp() */
-				state->dp = ndp->ni_erootdir;
+				state->namei_startdir = ndp->ni_erootdir;
 			} else {
 				if (cwdi->cwdi_edir == NULL
 				    || (cnp->cn_pnbuf[1] == '.'
 					   && cnp->cn_pnbuf[2] == '.'
 					   && cnp->cn_pnbuf[3] == '/')) {
 					ndp->ni_erootdir = NULL;
 				} else {
-					state->dp = cwdi->cwdi_edir;
+					state->namei_startdir = cwdi->cwdi_edir;
-					ndp->ni_erootdir = state->dp;
+					ndp->ni_erootdir = state->namei_startdir;
+				}
+			}
 		} else {
 			ndp->ni_erootdir = NULL;
 			if (cnp->cn_flags & NOCHROOT)
-				state->dp = ndp->ni_rootdir = rootvnode;
+				state->namei_startdir = ndp->ni_rootdir = rootvnode;
+		}
 	} else {
-		state->dp = cwdi->cwdi_cdir;
+		state->namei_startdir = cwdi->cwdi_cdir;
 		ndp->ni_erootdir = NULL;
+	}
-	VREF(state->dp);
+	VREF(state->namei_startdir);
 	rw_exit(&cwdi->cwdi_lock);
 	/*
 	 * Ktrace it.
 	 */
 	if (ktrpoint(KTR_NAMEI)) {
 		if (ndp->ni_erootdir != NULL) {
 			/*
 			 * To make any sense, the trace entry need to have the
 			 * text of the emulation path prepended.
 			 * Usually we can get this from the current process,
 			 * but when called from emul_find_interp() it is only
 			 * in the exec_package - so we get it passed in ni_next
 			 * (this is a hack).
 			 */
 			const char *emul_path;
 			if (cnp->cn_flags & EMULROOTSET)
 				emul_path = ndp->ni_next;
 			else
 				emul_path = self->l_proc->p_emul->e_path;
 			ktrnamei2(emul_path, strlen(emul_path),
 			    cnp->cn_pnbuf, ndp->ni_pathlen);
 		} else
 			ktrnamei(cnp->cn_pnbuf, ndp->ni_pathlen);
+	}
-	vn_lock(state->dp, LK_EXCLUSIVE | LK_RETRY);
+	vn_lock(state->namei_startdir, LK_EXCLUSIVE | LK_RETRY);
 	return 0;
+}
 /*
  * Undo namei_start: unlock and release the current lookup directory,
  * and discard the path buffer.
  */
 static void
 namei_end(struct namei_state *state)
+{
-	vput(state->dp);
+	vput(state->namei_startdir);
 	PNBUF_PUT(state->cnp->cn_pnbuf);
 	//state->cnp->cn_pnbuf = NULL; // not yet (just in case) (XXX)
+}
 /*
  * Check for being at a symlink.
  */
 static inline int
 namei_atsymlink(struct namei_state *state)
+{
 	return (state->cnp->cn_flags & ISSYMLINK) != 0;
+}
 @@ -464,43 +484,43 @@ badlink:
 	     symlink_magic(self->l_proc, cp, &linklen)) ||
 	    (linklen + ndp->ni_pathlen >= MAXPATHLEN)) {
 		error = ENAMETOOLONG;
 		goto badlink;
+	}
 	if (ndp->ni_pathlen > 1) {
 		memcpy(cp + linklen, ndp->ni_next, ndp->ni_pathlen);
 		PNBUF_PUT(cnp->cn_pnbuf);
 		cnp->cn_pnbuf = cp;
 	} else
 		cnp->cn_pnbuf[linklen] = '\0';
 	ndp->ni_pathlen += linklen;
 	vput(ndp->ni_vp);
-	state->dp = ndp->ni_dvp;
+	state->namei_startdir = ndp->ni_dvp;
 	/*
 	 * Check if root directory should replace current directory.
 	 */
 	if (cnp->cn_pnbuf[0] == '/') {
-		vput(state->dp);
+		vput(state->namei_startdir);
 		/* Keep absolute symbolic links inside emulation root */
-		state->dp = ndp->ni_erootdir;
+		state->namei_startdir = ndp->ni_erootdir;
-		if (state->dp == NULL || (cnp->cn_pnbuf[1] == '.'
+		if (state->namei_startdir == NULL || (cnp->cn_pnbuf[1] == '.'
 					  && cnp->cn_pnbuf[2] == '.'
 					  && cnp->cn_pnbuf[3] == '/')) {
 			ndp->ni_erootdir = NULL;
-			state->dp = ndp->ni_rootdir;
+			state->namei_startdir = ndp->ni_rootdir;
+		}
-		VREF(state->dp);
+		VREF(state->namei_startdir);
-		vn_lock(state->dp, LK_EXCLUSIVE | LK_RETRY);
+		vn_lock(state->namei_startdir, LK_EXCLUSIVE | LK_RETRY);
+	}
 	return 0;
+}
 //////////////////////////////
 static int
 do_namei(struct namei_state *state)
+{
 	int error;
 	struct nameidata *ndp = state->ndp;
 @@ -509,33 +529,33 @@ do_namei(struct namei_state *state)
 	KASSERT(cnp == &ndp->ni_cnd);
 	namei_start1(state);
     emul_retry:
 	error = namei_start2(state);
 	if (error) {
 		return error;
+	}
 	/* Loop through symbolic links */
 	for (;;) {
-		if (!state->dp->v_mount) {
+		if (state->namei_startdir->v_mount == NULL) {
 			/* Give up if the directory is no longer mounted */
 			namei_end(state);
 			return (ENOENT);
+		}
 		cnp->cn_nameptr = cnp->cn_pnbuf;
-		ndp->ni_startdir = state->dp;
+		ndp->ni_startdir = state->namei_startdir;
 		error = lookup(ndp);
 		if (error != 0) {
 			/* XXX this should use namei_end() */
 			if (ndp->ni_dvp) {
 				vput(ndp->ni_dvp);
+			}
 			if (ndp->ni_erootdir != NULL) {
 				/* Retry the whole thing from the normal root */
 				cnp->cn_flags &= ~TRYEMULROOT;
 				goto emul_retry;
+			}
 			PNBUF_PUT(cnp->cn_pnbuf);
 			return (error);
 @@ -650,427 +670,512 @@ namei_hash(const char *name, const char
  * dirloop:
  *	identify next component of name at ndp->ni_ptr
  *	handle degenerate case where name is null string
  *	if .. and crossing mount points and on mounted filesys, find parent
  *	call VOP_LOOKUP routine for next component name
  *	    directory vnode returned in ni_dvp, locked.
  *	    component vnode returned in ni_vp (if it exists), locked.
  *	if result vnode is mounted on and crossing mount points,
  *	    find mounted on vnode
  *	if more components of name, do next level at dirloop
  *	return the answer in ni_vp, locked if LOCKLEAF set
  *	    if LOCKPARENT set, return locked parent in ni_dvp
  */
 int
-lookup(struct nameidata *ndp)
+/*
  * Begin lookup().
  */
 static int
 lookup_start(struct namei_state *state)
+{
 	const char *cp;			/* pointer into pathname argument */
 	struct vnode *dp = 0;		/* the directory we are searching */
-	struct vnode *tdp;		/* saved dp */
+	struct componentname *cnp = state->cnp;
-	struct mount *mp;		/* mount table entry */
+	struct nameidata *ndp = state->ndp;
 	int docache;			/* == 0 do not cache last component */
-	int rdonly;			/* lookup read-only flag bit */
+	KASSERT(cnp == &ndp->ni_cnd);
 	int error = 0;
-	int slashes;
+	state->lookup_alldone = 0;
-	struct componentname *cnp = &ndp->ni_cnd;
+	state->dp = NULL;
 	struct lwp *l = curlwp;
 	/*
 	 * Setup: break out flag bits into variables.
 	 */
-	docache = (cnp->cn_flags & NOCACHE) ^ NOCACHE;
+	state->docache = (cnp->cn_flags & NOCACHE) ^ NOCACHE;
 	if (cnp->cn_nameiop == DELETE)
-		docache = 0;
+		state->docache = 0;
-	rdonly = cnp->cn_flags & RDONLY;
+	state->rdonly = cnp->cn_flags & RDONLY;
 	ndp->ni_dvp = NULL;
 	cnp->cn_flags &= ~ISSYMLINK;
-	dp = ndp->ni_startdir;
+	state->dp = ndp->ni_startdir;
 	ndp->ni_startdir = NULLVP;
 	/*
 	 * If we have a leading string of slashes, remove them, and just make
 	 * sure the current node is a directory.
 	 */
 	cp = cnp->cn_nameptr;
 	if (*cp == '/') {
 		do {
 			cp++;
 		} while (*cp == '/');
 		ndp->ni_pathlen -= cp - cnp->cn_nameptr;
 		cnp->cn_nameptr = cp;
-		if (dp->v_type != VDIR) {
+		if (state->dp->v_type != VDIR) {
-			error = ENOTDIR;
+			vput(state->dp);
-			vput(dp);
+			return ENOTDIR;
 			goto bad;
+		}
 		/*
 		 * If we've exhausted the path name, then just return the
 		 * current node.
 		 */
 		if (cnp->cn_nameptr[0] == '\0') {
-			ndp->ni_vp = dp;
+			ndp->ni_vp = state->dp;
 			cnp->cn_flags |= ISLASTCN;
 			goto terminal;
 			/* bleh */
 			state->lookup_alldone = 1;
 			return 0;
+		}
+	}
-dirloop:
+	return 0;
+}
 static int
 lookup_parsepath(struct namei_state *state)
+{
 	const char *cp;			/* pointer into pathname argument */
 	struct componentname *cnp = state->cnp;
 	struct nameidata *ndp = state->ndp;
 	KASSERT(cnp == &ndp->ni_cnd);
 	/*
 	 * Search a new directory.
+	 *
 	 * The cn_hash value is for use by vfs_cache.
 	 * The last component of the filename is left accessible via
 	 * cnp->cn_nameptr for callers that need the name. Callers needing
 	 * the name set the SAVENAME flag. When done, they assume
 	 * responsibility for freeing the pathname buffer.
+	 *
 	 * At this point, our only vnode state is that "dp" is held and locked.
 	 */
 	cnp->cn_consume = 0;
 	cp = NULL;
 	cnp->cn_hash = namei_hash(cnp->cn_nameptr, &cp);
 	cnp->cn_namelen = cp - cnp->cn_nameptr;
 	if (cnp->cn_namelen > NAME_MAX) {
-		vput(dp);
+		vput(state->dp);
 		error = ENAMETOOLONG;
 		ndp->ni_dvp = NULL;
-		goto bad;
+		return ENAMETOOLONG;
+	}
 #ifdef NAMEI_DIAGNOSTIC
 	{ char c = *cp;
 	*(char *)cp = '\0';
 	printf("{%s}: ", cnp->cn_nameptr);
 	*(char *)cp = c; }
 #endif /* NAMEI_DIAGNOSTIC */
 	ndp->ni_pathlen -= cnp->cn_namelen;
 	ndp->ni_next = cp;
 	/*
 	 * If this component is followed by a slash, then move the pointer to
 	 * the next component forward, and remember that this component must be
 	 * a directory.
 	 */
 	if (*cp == '/') {
 		do {
 			cp++;
 		} while (*cp == '/');
-		slashes = cp - ndp->ni_next;
+		state->slashes = cp - ndp->ni_next;
-		ndp->ni_pathlen -= slashes;
+		ndp->ni_pathlen -= state->slashes;
 		ndp->ni_next = cp;
 		cnp->cn_flags |= REQUIREDIR;
 	} else {
-		slashes = 0;
+		state->slashes = 0;
 		cnp->cn_flags &= ~REQUIREDIR;
+	}
 	/*
 	 * We do special processing on the last component, whether or not it's
 	 * a directory.  Cache all intervening lookups, but not the final one.
 	 */
 	if (*cp == '\0') {
-		if (docache)
+		if (state->docache)
 			cnp->cn_flags |= MAKEENTRY;
 		else
 			cnp->cn_flags &= ~MAKEENTRY;
 		cnp->cn_flags |= ISLASTCN;
 	} else {
 		cnp->cn_flags |= MAKEENTRY;
 		cnp->cn_flags &= ~ISLASTCN;
+	}
 	if (cnp->cn_namelen == 2 &&
 	    cnp->cn_nameptr[1] == '.' && cnp->cn_nameptr[0] == '.')
 		cnp->cn_flags |= ISDOTDOT;
 	else
 		cnp->cn_flags &= ~ISDOTDOT;
 	return 0;
+}
 static int
 lookup_once(struct namei_state *state)
+{
 	struct vnode *tdp;		/* saved dp */
 	struct mount *mp;		/* mount table entry */
 	struct lwp *l = curlwp;
 	int error;
 	struct componentname *cnp = state->cnp;
 	struct nameidata *ndp = state->ndp;
 	KASSERT(cnp == &ndp->ni_cnd);
 	/*
 	 * Handle "..": two special cases.
 	 * 1. If at root directory (e.g. after chroot)
 	 *    or at absolute root directory
 	 *    then ignore it so can't get out.
 	 * 1a. If at the root of the emulation filesystem go to the real
 	 *    root. So "/../<path>" is always absolute.
 	 * 1b. If we have somehow gotten out of a jail, warn
 	 *    and also ignore it so we can't get farther out.
 	 * 2. If this vnode is the root of a mounted
 	 *    filesystem, then replace it with the
 	 *    vnode which was mounted on so we take the
 	 *    .. in the other file system.
 	 */
 	if (cnp->cn_flags & ISDOTDOT) {
 		struct proc *p = l->l_proc;
 		for (;;) {
-			if (dp == ndp->ni_rootdir || dp == rootvnode) {
+			if (state->dp == ndp->ni_rootdir || state->dp == rootvnode) {
-				ndp->ni_dvp = dp;
+				ndp->ni_dvp = state->dp;
-				ndp->ni_vp = dp;
+				ndp->ni_vp = state->dp;
-				VREF(dp);
+				VREF(state->dp);
-				goto nextname;
+				return 0;
+			}
 			if (ndp->ni_rootdir != rootvnode) {
 				int retval;
-				VOP_UNLOCK(dp, 0);
+				VOP_UNLOCK(state->dp, 0);
-				retval = vn_isunder(dp, ndp->ni_rootdir, l);
+				retval = vn_isunder(state->dp, ndp->ni_rootdir, l);
-				vn_lock(dp, LK_EXCLUSIVE | LK_RETRY);
+				vn_lock(state->dp, LK_EXCLUSIVE | LK_RETRY);
 				if (!retval) {
 				    /* Oops! We got out of jail! */
 				    log(LOG_WARNING,
 					"chrooted pid %d uid %d (%s) "
 					"detected outside of its chroot\n",
 					p->p_pid, kauth_cred_geteuid(l->l_cred),
 					p->p_comm);
 				    /* Put us at the jail root. */
-				    vput(dp);
+				    vput(state->dp);
-				    dp = ndp->ni_rootdir;
+				    state->dp = ndp->ni_rootdir;
-				    ndp->ni_dvp = dp;
+				    ndp->ni_dvp = state->dp;
-				    ndp->ni_vp = dp;
+				    ndp->ni_vp = state->dp;
-				    VREF(dp);
+				    VREF(state->dp);
-				    VREF(dp);
+				    VREF(state->dp);
-				    vn_lock(dp, LK_EXCLUSIVE | LK_RETRY);
+				    vn_lock(state->dp, LK_EXCLUSIVE | LK_RETRY);
-				    goto nextname;
+				    return 0;
+				}
+			}
-			if ((dp->v_vflag & VV_ROOT) == 0 ||
+			if ((state->dp->v_vflag & VV_ROOT) == 0 ||
 			    (cnp->cn_flags & NOCROSSMOUNT))
 				break;
-			tdp = dp;
+			tdp = state->dp;
-			dp = dp->v_mount->mnt_vnodecovered;
+			state->dp = state->dp->v_mount->mnt_vnodecovered;
 			vput(tdp);
-			VREF(dp);
+			VREF(state->dp);
-			vn_lock(dp, LK_EXCLUSIVE | LK_RETRY);
+			vn_lock(state->dp, LK_EXCLUSIVE | LK_RETRY);
+		}
+	}
 	/*
 	 * We now have a segment name to search for, and a directory to search.
 	 * Again, our only vnode state is that "dp" is held and locked.
 	 */
 unionlookup:
-	ndp->ni_dvp = dp;
+	ndp->ni_dvp = state->dp;
 	ndp->ni_vp = NULL;
-	error = VOP_LOOKUP(dp, &ndp->ni_vp, cnp);
+	error = VOP_LOOKUP(state->dp, &ndp->ni_vp, cnp);
 	if (error != 0) {
 #ifdef DIAGNOSTIC
 		if (ndp->ni_vp != NULL)
 			panic("leaf `%s' should be empty", cnp->cn_nameptr);
 #endif /* DIAGNOSTIC */
 #ifdef NAMEI_DIAGNOSTIC
 		printf("not found\n");
 #endif /* NAMEI_DIAGNOSTIC */
 		if ((error == ENOENT) &&
-		    (dp->v_vflag & VV_ROOT) &&
+		    (state->dp->v_vflag & VV_ROOT) &&
-		    (dp->v_mount->mnt_flag & MNT_UNION)) {
+		    (state->dp->v_mount->mnt_flag & MNT_UNION)) {
-			tdp = dp;
+			tdp = state->dp;
-			dp = dp->v_mount->mnt_vnodecovered;
+			state->dp = state->dp->v_mount->mnt_vnodecovered;
 			vput(tdp);
-			VREF(dp);
+			VREF(state->dp);
-			vn_lock(dp, LK_EXCLUSIVE | LK_RETRY);
+			vn_lock(state->dp, LK_EXCLUSIVE | LK_RETRY);
 			goto unionlookup;
+		}
 		if (error != EJUSTRETURN)
-			goto bad;
+			return error;
 		/*
 		 * If this was not the last component, or there were trailing
 		 * slashes, and we are not going to create a directory,
 		 * then the name must exist.
 		 */
 		if ((cnp->cn_flags & (REQUIREDIR | CREATEDIR)) == REQUIREDIR) {
-			error = ENOENT;
+			return ENOENT;
 			goto bad;
+		}
 		/*
 		 * If creating and at end of pathname, then can consider
 		 * allowing file to be created.
 		 */
-		if (rdonly) {
+		if (state->rdonly) {
-			error = EROFS;
+			return EROFS;
 			goto bad;
+		}
 		/*
 		 * We return with ni_vp NULL to indicate that the entry
 		 * doesn't currently exist, leaving a pointer to the
 		 * (possibly locked) directory vnode in ndp->ni_dvp.
 		 */
 		if (cnp->cn_flags & SAVESTART) {
 			ndp->ni_startdir = ndp->ni_dvp;
 			VREF(ndp->ni_startdir);
+		}
 		state->lookup_alldone = 1;
 		return (0);
+	}
 #ifdef NAMEI_DIAGNOSTIC
 	printf("found\n");
 #endif /* NAMEI_DIAGNOSTIC */
 	/*
 	 * Take into account any additional components consumed by the
 	 * underlying filesystem.  This will include any trailing slashes after
 	 * the last component consumed.
 	 */
 	if (cnp->cn_consume > 0) {
-		ndp->ni_pathlen -= cnp->cn_consume - slashes;
+		ndp->ni_pathlen -= cnp->cn_consume - state->slashes;
-		ndp->ni_next += cnp->cn_consume - slashes;
+		ndp->ni_next += cnp->cn_consume - state->slashes;
 		cnp->cn_consume = 0;
 		if (ndp->ni_next[0] == '\0')
 			cnp->cn_flags |= ISLASTCN;
+	}
-	dp = ndp->ni_vp;
+	state->dp = ndp->ni_vp;
 	/*
-	 * "dp" and "ndp->ni_dvp" are both locked and held,
+	 * "state->dp" and "ndp->ni_dvp" are both locked and held,
 	 * and may be the same vnode.
 	 */
 	/*
 	 * Check to see if the vnode has been mounted on;
 	 * if so find the root of the mounted file system.
 	 */
-	while (dp->v_type == VDIR && (mp = dp->v_mountedhere) &&
+	while (state->dp->v_type == VDIR && (mp = state->dp->v_mountedhere) &&
 	       (cnp->cn_flags & NOCROSSMOUNT) == 0) {
 		error = vfs_busy(mp, NULL);
 		if (error != 0) {
-			vput(dp);
+			vput(state->dp);
-			goto bad;
+			return error;
+		}
-		KASSERT(ndp->ni_dvp != dp);
+		KASSERT(ndp->ni_dvp != state->dp);
 		VOP_UNLOCK(ndp->ni_dvp, 0);
-		vput(dp);
+		vput(state->dp);
 		error = VFS_ROOT(mp, &tdp);
 		vfs_unbusy(mp, false, NULL);
 		if (error) {
 			vn_lock(ndp->ni_dvp, LK_EXCLUSIVE | LK_RETRY);
-			goto bad;
+			return error;
+		}
 		VOP_UNLOCK(tdp, 0);
-		ndp->ni_vp = dp = tdp;
+		ndp->ni_vp = state->dp = tdp;
 		vn_lock(ndp->ni_dvp, LK_EXCLUSIVE | LK_RETRY);
 		vn_lock(ndp->ni_vp, LK_EXCLUSIVE | LK_RETRY);
+	}
 	return 0;
+}
 static int
 do_lookup(struct namei_state *state)
+{
 	int error = 0;
 	struct componentname *cnp = state->cnp;
 	struct nameidata *ndp = state->ndp;
 	KASSERT(cnp == &ndp->ni_cnd);
 	error = lookup_start(state);
 	if (error) {
 		goto bad;
+	}
 	// XXX: this case should not be necessary given proper handling
 	// of slashes elsewhere.
 	if (state->lookup_alldone) {
 		goto terminal;
+	}
 dirloop:
 	error = lookup_parsepath(state);
 	if (error) {
 		goto bad;
+	}
 	error = lookup_once(state);
 	if (error) {
 		goto bad;
+	}
 	// XXX ought to be able to avoid this case too
 	if (state->lookup_alldone) {
 		/* this should NOT be "goto terminal;" */
 		return 0;
+	}
 	/*
 	 * Check for symbolic link.  Back up over any slashes that we skipped,
 	 * as we will need them again.
 	 */
-	if ((dp->v_type == VLNK) && (cnp->cn_flags & (FOLLOW|REQUIREDIR))) {
+	if ((state->dp->v_type == VLNK) && (cnp->cn_flags & (FOLLOW|REQUIREDIR))) {
-		ndp->ni_pathlen += slashes;
+		ndp->ni_pathlen += state->slashes;
-		ndp->ni_next -= slashes;
+		ndp->ni_next -= state->slashes;
 		cnp->cn_flags |= ISSYMLINK;
 		return (0);
+	}
 	/*
 	 * Check for directory, if the component was followed by a series of
 	 * slashes.
 	 */
-	if ((dp->v_type != VDIR) && (cnp->cn_flags & REQUIREDIR)) {
+	if ((state->dp->v_type != VDIR) && (cnp->cn_flags & REQUIREDIR)) {
 		error = ENOTDIR;
-		KASSERT(dp != ndp->ni_dvp);
+		KASSERT(state->dp != ndp->ni_dvp);
-		vput(dp);
+		vput(state->dp);
 		goto bad;
+	}
 nextname:
 	/*
 	 * Not a symbolic link.  If this was not the last component, then
 	 * continue at the next component, else return.
 	 */
 	if (!(cnp->cn_flags & ISLASTCN)) {
 		cnp->cn_nameptr = ndp->ni_next;
-		if (ndp->ni_dvp == dp) {
+		if (ndp->ni_dvp == state->dp) {
 			vrele(ndp->ni_dvp);
 		} else {
 			vput(ndp->ni_dvp);
+		}
 		goto dirloop;
+	}
 terminal:
-	if (dp == ndp->ni_erootdir) {
+	if (state->dp == ndp->ni_erootdir) {
 		/*
 		 * We are about to return the emulation root.
 		 * This isn't a good idea because code might repeatedly
 		 * lookup ".." until the file matches that returned
 		 * for "/" and loop forever.
 		 * So convert it to the real root.
 		 */
-		if (ndp->ni_dvp == dp)
+		if (ndp->ni_dvp == state->dp)
-			vrele(dp);
+			vrele(state->dp);
 		else
 			if (ndp->ni_dvp != NULL)
 				vput(ndp->ni_dvp);
 		ndp->ni_dvp = NULL;
-		vput(dp);
+		vput(state->dp);
-		dp = ndp->ni_rootdir;
+		state->dp = ndp->ni_rootdir;
-		VREF(dp);
+		VREF(state->dp);
-		vn_lock(dp, LK_EXCLUSIVE | LK_RETRY);
+		vn_lock(state->dp, LK_EXCLUSIVE | LK_RETRY);
-		ndp->ni_vp = dp;
+		ndp->ni_vp = state->dp;
+	}
 	/*
 	 * If the caller requested the parent node (i.e.
 	 * it's a CREATE, DELETE, or RENAME), and we don't have one
 	 * (because this is the root directory), then we must fail.
 	 */
 	if (ndp->ni_dvp == NULL && cnp->cn_nameiop != LOOKUP) {
 		switch (cnp->cn_nameiop) {
 		case CREATE:
 			error = EEXIST;
 			break;
 		case DELETE:
 		case RENAME:
 			error = EBUSY;
 			break;
 		default:
 			KASSERT(0);
+		}
-		vput(dp);
+		vput(state->dp);
 		goto bad;
+	}
 	/*
 	 * Disallow directory write attempts on read-only lookups.
 	 * Prefers EEXIST over EROFS for the CREATE case.
 	 */
-	if (rdonly &&
+	if (state->rdonly &&
 	    (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME)) {
 		error = EROFS;
-		if (dp != ndp->ni_dvp) {
+		if (state->dp != ndp->ni_dvp) {
-			vput(dp);
+			vput(state->dp);
+		}
 		goto bad;
+	}
 	if (ndp->ni_dvp != NULL) {
 		if (cnp->cn_flags & SAVESTART) {
 			ndp->ni_startdir = ndp->ni_dvp;
 			VREF(ndp->ni_startdir);
+		}
+	}
 	if ((cnp->cn_flags & LOCKLEAF) == 0) {
-		VOP_UNLOCK(dp, 0);
+		VOP_UNLOCK(state->dp, 0);
+	}
 	return (0);
 bad:
 	ndp->ni_vp = NULL;
 	return (error);
+}
 /*
  * Externally visible interface used by nfsd (bletch, yuk, XXX)
  */
 int
 lookup(struct nameidata *ndp)
+{
 	struct namei_state state;
 	int error;
 	/* For now at least we don't have to frob the state */
 	namei_init(&state, ndp);
 	error = do_lookup(&state);
 	namei_cleanup(&state);
 	return error;
+}
 /*
  * Reacquire a path name component.
  * dvp is locked on entry and exit.
  * *vpp is locked on exit unless it's NULL.
  */
 int
 relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp)
+{
 	int rdonly;			/* lookup read-only flag bit */
 	int error = 0;
 #ifdef DEBUG
 	uint32_t newhash;		/* DEBUG: check name hash */
 	const char *cp;			/* DEBUG: check name ptr/len */
 #endif /* DEBUG */