 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_lookup.c,v 1.136 2011/04/11 01:36:28 dholland Exp $	*/
+/*	$NetBSD: vfs_lookup.c,v 1.137 2011/04/11 01:36:59 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.136 2011/04/11 01:36:28 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.137 2011/04/11 01:36:59 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>
 @@ -403,26 +403,28 @@ 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;
 	unsigned attempt_retry:1;	/* true if error allows emul retry */
 };
 /*
  * Initialize the namei working state.
  */
 static void
 namei_init(struct namei_state *state, struct nameidata *ndp)
+{
 	state->ndp = ndp;
 	state->cnp = &ndp->ni_cnd;
 	KASSERT((state->cnp->cn_flags & INRELOOKUP) == 0);
 @@ -1223,151 +1225,171 @@ terminal:
 	if ((cnp->cn_flags & LOCKLEAF) == 0) {
 		VOP_UNLOCK(state->dp);
+	}
 	return (0);
 bad:
 	ndp->ni_vp = NULL;
 	return (error);
+}
 //////////////////////////////
 static int
-do_namei(struct namei_state *state, struct vnode *forcecwd,
+namei_oneroot(struct namei_state *state, struct vnode *forcecwd,
 	 int neverfollow, int inhibitmagic)
+{
 	int error;
 	struct nameidata *ndp = state->ndp;
 	struct componentname *cnp = state->cnp;
-	const char *savepath = NULL;
+	int error;
 	KASSERT(cnp == &ndp->ni_cnd);
 	if (cnp->cn_flags & TRYEMULROOT) {
 		savepath = pathbuf_stringcopy_get(ndp->ni_pathbuf);
     emul_retry:
 	if (savepath != NULL) {
 		/* kinda gross */
 		strcpy(ndp->ni_pathbuf->pb_path, savepath);
 		pathbuf_stringcopy_put(ndp->ni_pathbuf, savepath);
 		savepath = NULL;
 	error = namei_start(state, forcecwd);
 	if (error) {
 		if (savepath != NULL) {
 			pathbuf_stringcopy_put(ndp->ni_pathbuf, savepath);
 		return error;
+	}
 	/*
 	 * Keep going until we run out of path components.
 	 */
 	for (;;) {
 		/*
 		 * If the directory we're on is unmounted, bail out.
 		 * XXX: should this also check if it's unlinked?
 		 */
 		if (state->namei_startdir->v_mount == NULL) {
 			if (savepath != NULL) {
 				pathbuf_stringcopy_put(ndp->ni_pathbuf, savepath);
 			namei_end(state);
 			return (ENOENT);
+		}
 		/*
 		 * Look up the next path component.
 		 * (currently, this may consume more than one)
 		 */
 		error = do_lookup(state, state->namei_startdir);
 		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 */
+			 * Note that if we're doing TRYEMULROOT we can
-				cnp->cn_flags &= ~TRYEMULROOT;
+			 * retry with the normal root. Setting this
-				goto emul_retry;
+			 * here matches previous practice, but the
 			 * previous practice didn't make much sense
-			KASSERT(savepath == NULL);
+			 * and somebody should sit down and figure out
 			 * which cases should cause retry and which
 			 * shouldn't. XXX.
 			 */
 			state->attempt_retry = 1;
 			return (error);
+		}
 		/*
 		 * If we've reached a symbolic link, follow it, unless we
 		 * aren't supposed to.
 		 */
 		if (namei_atsymlink(state)) {
 			if (neverfollow) {
 				error = EINVAL;
 			} else {
 				error = namei_follow(state, inhibitmagic);
+			}
 			if (error) {
 				KASSERT(ndp->ni_dvp != ndp->ni_vp);
 				vput(ndp->ni_dvp);
 				vput(ndp->ni_vp);
 				ndp->ni_vp = NULL;
 				if (savepath != NULL) {
 					pathbuf_stringcopy_put(ndp->ni_pathbuf, savepath);
 				return error;
+			}
+		}
 		else {
 			break;
+		}
+	}
 	/*
 	 * Done.
 	 */
 	/*
 	 * If LOCKPARENT is not set, the parent directory isn't returned.
 	 */
 	if ((cnp->cn_flags & LOCKPARENT) == 0 && ndp->ni_dvp != NULL) {
 		if (ndp->ni_dvp == ndp->ni_vp) {
 			vrele(ndp->ni_dvp);
 		} else {
 			vput(ndp->ni_dvp);
+		}
 		ndp->ni_dvp = NULL;
+	}
 	return 0;
+}
 static int
 namei_tryemulroot(struct namei_state *state, struct vnode *forcecwd,
 	 int neverfollow, int inhibitmagic)
+{
 	int error;
 	struct nameidata *ndp = state->ndp;
 	struct componentname *cnp = state->cnp;
 	const char *savepath = NULL;
 	KASSERT(cnp == &ndp->ni_cnd);
 	if (cnp->cn_flags & TRYEMULROOT) {
 		savepath = pathbuf_stringcopy_get(ndp->ni_pathbuf);
+	}
     emul_retry:
 	state->attempt_retry = 0;
 	error = namei_oneroot(state, forcecwd, neverfollow, inhibitmagic);
 	if (error) {
 		/*
 		 * Once namei has started up, the existence of ni_erootdir
 		 * tells us whether we're working from an emulation root.
 		 * The TRYEMULROOT flag isn't necessarily authoritative.
 		 */
 		if (ndp->ni_erootdir != NULL && state->attempt_retry) {
 			/* Retry the whole thing using the normal root */
 			cnp->cn_flags &= ~TRYEMULROOT;
 			state->attempt_retry = 0;
 			/* kinda gross */
 			strcpy(ndp->ni_pathbuf->pb_path, savepath);
 			pathbuf_stringcopy_put(ndp->ni_pathbuf, savepath);
 			savepath = NULL;
 			goto emul_retry;
+		}
+	}
 	if (savepath != NULL) {
 		pathbuf_stringcopy_put(ndp->ni_pathbuf, savepath);
+	}
 	return error;
 	return 0;
+}
 int
 namei(struct nameidata *ndp)
+{
 	struct namei_state state;
 	int error;
 	namei_init(&state, ndp);
-	error = do_namei(&state, NULL, 0/*!neverfollow*/, 0/*!inhibitmagic*/);
+	error = namei_tryemulroot(&state, NULL,
 /*!neverfollow*/, 0/*!inhibitmagic*/);
 	namei_cleanup(&state);
 	return error;
+}
 ////////////////////////////////////////////////////////////
 /*
  * Externally visible interfaces used by nfsd (bletch, yuk, XXX)
+ *
  * The "index" version differs from the "main" version in that it's
  * called from a different place in a different context. For now I
  * want to be able to shuffle code in from one call site without
 @@ -1376,27 +1398,28 @@ namei(struct nameidata *ndp)
  * It turns out that the "main" version was a cut and pasted copy of
  * namei with a few changes; the "index" version on the other hand
  * always takes a single component and is an elaborate form of calling
  * VOP_LOOKUP once.
  */
 int
 lookup_for_nfsd(struct nameidata *ndp, struct vnode *forcecwd, int neverfollow)
+{
 	struct namei_state state;
 	int error;
 	namei_init(&state, ndp);
-	error = do_namei(&state, forcecwd, neverfollow, 1/*inhibitmagic*/);
+	error = namei_tryemulroot(&state, forcecwd,
 				  neverfollow, 1/*inhibitmagic*/);
 	namei_cleanup(&state);
 	return error;
+}
 static int
 do_lookup_for_nfsd_index(struct namei_state *state, struct vnode *startdir)
+{
 	int error = 0;
 	struct componentname *cnp = state->cnp;
 	struct nameidata *ndp = state->ndp;
 	const char *cp;			/* pointer into pathname argument */