 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_lookup.c,v 1.150 2011/04/11 02:12:58 dholland Exp $	*/
+/*	$NetBSD: vfs_lookup.c,v 1.151 2011/04/11 02:13:10 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.150 2011/04/11 02:12:58 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.151 2011/04/11 02:13:10 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>
 @@ -616,35 +616,26 @@ namei_start(struct namei_state *state, s
 		/* no ktrace */
 	} else {
 		startdir = namei_getstartdir(state);
 		namei_ktrace(state);
+	}
 	vn_lock(startdir, LK_EXCLUSIVE | LK_RETRY);
 	*startdir_ret = startdir;
 	return 0;
+}
 /*
  * Undo namei_start: unlock and release the current lookup directory.
  */
 static void
 namei_end(struct namei_state *state)
 	vput(state->namei_startdir);
 /*
  * Check for being at a symlink.
  */
 static inline int
 namei_atsymlink(struct namei_state *state, struct vnode *foundobj)
+{
 	return (foundobj->v_type == VLNK) &&
 		(state->cnp->cn_flags & (FOLLOW|REQUIREDIR));
+}
 /*
  * Follow a symlink.
  */
 static inline int
 @@ -1067,27 +1058,27 @@ namei_oneroot(struct namei_state *state,
 	state->rdonly = cnp->cn_flags & RDONLY;
 	/*
 	 * Keep going until we run out of path components.
 	 */
 	cnp->cn_nameptr = ndp->ni_pnbuf;
 	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) {
-			namei_end(state);
+			vput(state->namei_startdir);
 			return (ENOENT);
+		}
 		/*
 		 * Look up the next path component.
 		 * (currently, this may consume more than one)
 		 */
 		state->lookup_alldone = 0;
 		ndp->ni_dvp = NULL;
 		cnp->cn_flags &= ~ISSYMLINK;
 		searchdir = state->namei_startdir;
 @@ -1099,66 +1090,63 @@ namei_oneroot(struct namei_state *state,
 		 * directory.
 		 */
 		cp = cnp->cn_nameptr;
 		if (*cp == '/') {
 			do {
 				cp++;
 			} while (*cp == '/');
 			ndp->ni_pathlen -= cp - cnp->cn_nameptr;
 			cnp->cn_nameptr = cp;
 			if (searchdir->v_type != VDIR) {
 				vput(searchdir);
 				ndp->ni_vp = NULL;
 				/* XXX this should use namei_end() */
 				if (ndp->ni_dvp) {
 					vput(ndp->ni_dvp);
+				}
 				state->attempt_retry = 1;
 				return ENOTDIR;
+			}
+		}
 		/*
 		 * If we've exhausted the path name, then just return the
 		 * current node.
 		 */
 		if (cnp->cn_nameptr[0] == '\0') {
 			foundobj = searchdir;
 			ndp->ni_vp = foundobj;
 			cnp->cn_flags |= ISLASTCN;
 			/* bleh */
 			goto terminal;
+		}
 		error = lookup_parsepath(state);
 		if (error) {
 			vput(searchdir);
 			ndp->ni_dvp = NULL;
 			ndp->ni_vp = NULL;
 			/* XXX this should use namei_end() */
 			if (ndp->ni_dvp) {
 				vput(ndp->ni_dvp);
+			}
 			state->attempt_retry = 1;
 			return (error);
+		}
 		error = lookup_once(state, searchdir, &searchdir, &foundobj);
 		ndp->ni_dvp = searchdir;
 		if (error) {
 			ndp->ni_vp = NULL;
 			/* XXX this should use namei_end() */
 			if (ndp->ni_dvp) {
 				vput(ndp->ni_dvp);
+			}
 			/*
 			 * Note that if we're doing TRYEMULROOT we can
 			 * retry with the normal root. Where this is
 			 * currently set matches previous practice,
 			 * but the previous practice didn't make much
 			 * sense and somebody should sit down and
 			 * figure out which cases should cause retry
 			 * and which shouldn't. XXX.
 			 */
 			state->attempt_retry = 1;
 @@ -1199,27 +1187,26 @@ namei_oneroot(struct namei_state *state,
+			}
 			cnp->cn_nameptr = ndp->ni_pnbuf;
 			continue;
+		}
 		/*
 		 * Check for directory, if the component was
 		 * followed by a series of slashes.
 		 */
 		if ((foundobj->v_type != VDIR) && (cnp->cn_flags & REQUIREDIR)) {
 			KASSERT(foundobj != ndp->ni_dvp);
 			vput(foundobj);
 			ndp->ni_vp = NULL;
 			/* XXX this should use namei_end() */
 			if (ndp->ni_dvp) {
 				vput(ndp->ni_dvp);
+			}
 			state->attempt_retry = 1;
 			return ENOTDIR;
+		}
 		/*
 		 * Not a symbolic link.  If this was not the
 		 * last component, then continue at the next
 		 * component, else return.
 		 */
 		if (!(cnp->cn_flags & ISLASTCN)) {
 @@ -1267,46 +1254,44 @@ namei_oneroot(struct namei_state *state,
 			switch (cnp->cn_nameiop) {
 			    case CREATE:
 				error = EEXIST;
 				break;
 			    case DELETE:
 			    case RENAME:
 				error = EBUSY;
 				break;
 			    default:
 				KASSERT(0);
+			}
 			vput(foundobj);
 			foundobj = NULL;
 			/* XXX this should use namei_end() */
 			if (ndp->ni_dvp) {
 				vput(ndp->ni_dvp);
+			}
 			state->attempt_retry = 1;
 			return (error);
+		}
 		/*
 		 * Disallow directory write attempts on read-only lookups.
 		 * Prefers EEXIST over EROFS for the CREATE case.
 		 */
 		if (state->rdonly &&
 		    (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME)) {
 			error = EROFS;
 			if (foundobj != ndp->ni_dvp) {
 				vput(foundobj);
+			}
 			ndp->ni_vp = NULL;
 			/* XXX this should use namei_end() */
 			if (ndp->ni_dvp) {
 				vput(ndp->ni_dvp);
+			}
 			state->attempt_retry = 1;
 			return (error);
+		}
 		if ((cnp->cn_flags & LOCKLEAF) == 0) {
 			VOP_UNLOCK(foundobj);
+		}
 		break;
+	}