Index: external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c
===================================================================
RCS file: /cvsroot/src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c,v
retrieving revision 1.7
diff -p -u -4 -r1.7 zfs_replay.c
--- external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c	30 Nov 2010 10:45:27 -0000	1.7
+++ external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c	25 Dec 2013 08:03:59 -0000
@@ -515,8 +515,10 @@ zfs_replay_create(zfsvfs_t *zfsvfs, lr_c
 		error = VOP_MKDIR(ZTOV(dzp), &vp, &cn, &xva.xva_vattr /*,vflg*/);
 		break;
 	case TX_MKXATTR:
 		error = zfs_make_xattrdir(dzp, &xva.xva_vattr, &vp, kcred);
+		if (error == 0 && vp != NULL)
+			VOP_UNLOCK(vp);
 		break;
 	case TX_SYMLINK:
 		name = (char *)(lr + 1);
 		link = name + strlen(name) + 1;
@@ -528,12 +530,10 @@ zfs_replay_create(zfsvfs_t *zfsvfs, lr_c
 	}
 	VOP_UNLOCK(ZTOV(dzp));
 
 out:
-	if (error == 0 && vp != NULL) {
-		VOP_UNLOCK(vp);
+	if (error == 0 && vp != NULL)
 		VN_RELE(vp);
-	}
 
 	VN_RELE(ZTOV(dzp));
 
 	if (zfsvfs->z_fuid_replay)
Index: external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
===================================================================
RCS file: /cvsroot/src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c,v
retrieving revision 1.14
diff -p -u -4 -r1.14 zfs_vnops.c
--- external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c	18 Oct 2012 14:22:57 -0000	1.14
+++ external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c	25 Dec 2013 08:03:59 -0000
@@ -4980,22 +4980,10 @@ zfs_netbsd_create(void *v)
 
 	/* XXX !EXCL is wrong here...  */
 	error = zfs_create(dvp, __UNCONST(cnp->cn_nameptr), vap, !EXCL, mode,
 	    vpp, cnp->cn_cred);
-	if (error) {
-		KASSERT(*vpp == NULL);
-		goto out;
-	}
-	KASSERT(*vpp != NULL);
-
-	/*
-	 * Lock *vpp in conformance to the VOP_CREATE protocol.
-	 */
-	vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
-
-out:
+	KASSERT((error == 0) == (*vpp != NULL));
 	KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
-	KASSERT((*vpp == NULL) || (VOP_ISLOCKED(*vpp) == LK_EXCLUSIVE));
 
 	/*
 	 * Unlock and release dvp because the VOP_CREATE protocol is insane.
 	 */
@@ -5088,22 +5076,10 @@ zfs_netbsd_mkdir(void *v)
 	vattr_init_mask(vap);
 
 	error = zfs_mkdir(dvp, __UNCONST(cnp->cn_nameptr), vap, vpp,
 	    cnp->cn_cred, NULL, 0, NULL);
-	if (error) {
-		KASSERT(*vpp == NULL);
-		goto out;
-	}
-	KASSERT(*vpp != NULL);
-
-	/*
-	 * Lock *vpp in conformance to the VOP_MKDIR protocol.
-	 */
-	vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
-
-out:
+	KASSERT((error == 0) == (*vpp != NULL));
 	KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
-	KASSERT((*vpp == NULL) || (VOP_ISLOCKED(*vpp) == LK_EXCLUSIVE));
 
 	/*
 	 * Unlock and release dvp because the VOP_MKDIR protocol is insane.
 	 */
@@ -5408,23 +5384,10 @@ zfs_netbsd_symlink(void *v)
 	vattr_init_mask(vap);
 
 	error = zfs_symlink(dvp, vpp, __UNCONST(cnp->cn_nameptr), vap, target,
 	    cnp->cn_cred, 0);
-	if (error) {
-		KASSERT(*vpp == NULL);
-		goto out;
-	}
-	KASSERT(*vpp != NULL);
-
-
-	/*
-	 * Lock *vpp in conformance to the VOP_SYMLINK protocol.
-	 */
-	vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
-
-out:
+	KASSERT((error == 0) == (*vpp != NULL));
 	KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);
-	KASSERT((*vpp == NULL) || (VOP_ISLOCKED(*vpp) == LK_EXCLUSIVE));
 
 	/*
 	 * Unlock and release dvp because the VOP_SYMLINK protocol is insane.
 	 */
Index: lib/libp2k/p2k.c
===================================================================
RCS file: /cvsroot/src/lib/libp2k/p2k.c,v
retrieving revision 1.60
diff -p -u -4 -r1.60 p2k.c
--- lib/libp2k/p2k.c	23 Nov 2012 14:27:14 -0000	1.60
+++ lib/libp2k/p2k.c	25 Dec 2013 08:04:06 -0000
@@ -807,9 +807,8 @@ do_makenode(struct puffs_usermount *pu, 
 	assert(RUMP_VOP_ISLOCKED(dvp) == 0);
 	freecn(cn);
 
 	if (rv == 0) {
-		RUMP_VOP_UNLOCK(vp);
 		p2n = getp2n(p2m, vp, true, p2n);
 		puffs_newinfo_setcookie(pni, p2n);
 	} else {
 		free(p2n);
Index: sys/coda/coda_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/coda/coda_vnops.c,v
retrieving revision 1.91
diff -p -u -4 -r1.91 coda_vnops.c
--- sys/coda/coda_vnops.c	17 Oct 2013 20:55:30 -0000	1.91
+++ sys/coda/coda_vnops.c	25 Dec 2013 08:04:07 -0000
@@ -1096,21 +1096,16 @@ coda_create(void *v)
 	    error));)
     }
 
     /*
-     * vnodeops(9) says that we must unlock the parent and lock the child.
-     * XXX Should we lock the child first?
+     * vnodeops(9) says that we must unlock the parent.
      */
     vput(dvp);
     if (!error) {
 #ifdef CODA_VERBOSE
 	if ((cnp->cn_flags & LOCKLEAF) == 0)
 	    /* This should not happen; flags are for lookup only. */
 	    printf("%s: LOCKLEAF not set!\n", __func__);
-
-	if ((error = vn_lock(*ap->a_vpp, LK_EXCLUSIVE)))
-	    /* XXX Perhaps avoid this panic. */
-	    panic("%s: couldn't lock child", __func__);
 #endif
     }
 
     return(error);
@@ -1421,18 +1416,10 @@ coda_mkdir(void *v)
     }
 
     /*
      * Currently, all mkdirs explicitly vput their dvp's.
-     * It also appears that we *must* lock the vpp, since
-     * lockleaf isn't set, but someone down the road is going
-     * to try to unlock the new directory.
      */
     vput(dvp);
-    if (!error) {
-	if ((error = vn_lock(*ap->a_vpp, LK_EXCLUSIVE))) {
-	    panic("%s: couldn't lock child", __func__);
-	}
-    }
 
     return(error);
 }
 
@@ -1575,10 +1562,11 @@ coda_symlink(void *v)
 	saved_cn_flags = cnp->cn_flags;
 	cnp->cn_flags &= ~(MODMASK | OPMASK);
 	cnp->cn_flags |= LOOKUP;
 	error = VOP_LOOKUP(dvp, ap->a_vpp, cnp);
+	if (ap->a_vpp != NULL && error == 0)
+		VOP_UNLOCK(*ap->a_vpp);
 	cnp->cn_flags = saved_cn_flags;
-	/* Either an error occurs, or ap->a_vpp is locked. */
     }
 
  exit:
     /* unlock and deference parent */
Index: sys/fs/msdosfs/msdosfs_lookup.c
===================================================================
RCS file: /cvsroot/src/sys/fs/msdosfs/msdosfs_lookup.c,v
retrieving revision 1.29
diff -p -u -4 -r1.29 msdosfs_lookup.c
--- sys/fs/msdosfs/msdosfs_lookup.c	26 Jan 2013 16:51:51 -0000	1.29
+++ sys/fs/msdosfs/msdosfs_lookup.c	25 Dec 2013 08:04:08 -0000
@@ -708,9 +708,14 @@ createde(struct denode *dep, struct deno
 				diroffset = MSDOSFSROOT_OFS;
 			else
 				diroffset = 0;
 		}
-		return deget(pmp, dirclust, diroffset, depp);
+		error = deget(pmp, dirclust, diroffset, depp);
+#ifndef MAKEFS
+		if (error == 0)
+			VOP_UNLOCK(DETOV(*depp));
+#endif
+		return error;
 	}
 
 	return 0;
 
Index: sys/fs/puffs/puffs_node.c
===================================================================
RCS file: /cvsroot/src/sys/fs/puffs/puffs_node.c,v
retrieving revision 1.30
diff -p -u -4 -r1.30 puffs_node.c
--- sys/fs/puffs/puffs_node.c	17 Oct 2013 21:03:27 -0000	1.30
+++ sys/fs/puffs/puffs_node.c	25 Dec 2013 08:04:08 -0000
@@ -242,9 +242,8 @@ puffs_newnode(struct mount *mp, struct v
 	if (error)
 		return error;
 
 	vp->v_type = type;
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	*vpp = vp;
 
 	if (PUFFS_USE_NAMECACHE(pmp))
 		cache_enter(dvp, vp, cnp->cn_nameptr, cnp->cn_namelen,
Index: sys/fs/smbfs/smbfs_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/fs/smbfs/smbfs_vnops.c,v
retrieving revision 1.86
diff -p -u -4 -r1.86 smbfs_vnops.c
--- sys/fs/smbfs/smbfs_vnops.c	18 Mar 2013 19:35:39 -0000	1.86
+++ sys/fs/smbfs/smbfs_vnops.c	25 Dec 2013 08:04:08 -0000
@@ -601,8 +601,10 @@ smbfs_create(void *v)
 	error = smbfs_smb_lookup(dnp, name, nmlen, &fattr, &scred);
 	if (error)
 		goto out;
 	error = smbfs_nget(VTOVFS(dvp), dvp, name, nmlen, &fattr, ap->a_vpp);
+	if (ap->a_vpp != NULL && error == 0)
+		VOP_UNLOCK(*ap->a_vpp);
 	if (error)
 		goto out;
 
 	cache_enter(dvp, *ap->a_vpp, cnp->cn_nameptr, cnp->cn_namelen,
@@ -804,8 +806,10 @@ smbfs_mkdir(void *v)
 	error = smbfs_smb_lookup(dnp, name, len, &fattr, &scred);
 	if (error)
 		goto out;
 	error = smbfs_nget(VTOVFS(dvp), dvp, name, len, &fattr, &vp);
+	if (error == 0)
+		VOP_UNLOCK(vp);
 	if (error)
 		goto out;
 	*ap->a_vpp = vp;
 
Index: sys/fs/sysvbfs/sysvbfs_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/fs/sysvbfs/sysvbfs_vnops.c,v
retrieving revision 1.49
diff -p -u -4 -r1.49 sysvbfs_vnops.c
--- sys/fs/sysvbfs/sysvbfs_vnops.c	24 Dec 2013 09:56:18 -0000	1.49
+++ sys/fs/sysvbfs/sysvbfs_vnops.c	25 Dec 2013 08:04:08 -0000
@@ -165,8 +165,9 @@ sysvbfs_create(void *arg)
 	bnode = (*a->a_vpp)->v_data;
 	bnode->update_ctime = true;
 	bnode->update_mtime = true;
 	bnode->update_atime = true;
+	VOP_UNLOCK(*a->a_vpp);
 
  unlock_exit:
 	/* unlock parent directory */
 	vput(a->a_dvp);	/* locked at sysvbfs_lookup(); */
Index: sys/fs/tmpfs/tmpfs_subr.c
===================================================================
RCS file: /cvsroot/src/sys/fs/tmpfs/tmpfs_subr.c,v
retrieving revision 1.92
diff -p -u -4 -r1.92 tmpfs_subr.c
--- sys/fs/tmpfs/tmpfs_subr.c	24 Nov 2013 17:16:29 -0000	1.92
+++ sys/fs/tmpfs/tmpfs_subr.c	25 Dec 2013 08:04:08 -0000
@@ -416,8 +416,10 @@ tmpfs_construct_node(vnode_t *dvp, vnode
 
 	/* Update the parent's timestamps. */
 	tmpfs_update(dvp, TMPFS_UPDATE_MTIME | TMPFS_UPDATE_CTIME);
 out:
+	if (vpp != NULL && error == 0)
+		VOP_UNLOCK(*vpp);
 	vput(dvp);
 	return error;
 }
 
Index: sys/fs/udf/udf_subr.c
===================================================================
RCS file: /cvsroot/src/sys/fs/udf/udf_subr.c,v
retrieving revision 1.122
diff -p -u -4 -r1.122 udf_subr.c
--- sys/fs/udf/udf_subr.c	21 Nov 2013 23:42:09 -0000	1.122
+++ sys/fs/udf/udf_subr.c	25 Dec 2013 08:04:08 -0000
@@ -5780,19 +5780,14 @@ udf_create_node_raw(struct vnode *dvp, s
 	error = getnewvnode(VT_UDF, ump->vfs_mountp, vnodeops, NULL, &nvp);
 	if (error)
 		return error;
 
-	/* lock node */
-	error = vn_lock(nvp, LK_EXCLUSIVE | LK_RETRY);
-	if (error)
-		goto error_out_unget;
-
 	/* reserve space for one logical block */
 	vpart_num = ump->node_part;
 	error = udf_reserve_space(ump, NULL, UDF_C_NODE,
 		vpart_num, 1, /* can_fail */ true);
 	if (error)
-		goto error_out_unlock;
+		goto error_out_unget;
 
 	/* allocate node */
 	error = udf_allocate_space(ump, NULL, UDF_C_NODE,
 			vpart_num, 1, &lmapping);
@@ -5875,9 +5870,9 @@ udf_create_node_raw(struct vnode *dvp, s
 		udf_free_allocated_space(ump, lb_num, vpart_num, 1);
 
 		/* recycle udf_node */
 		udf_dispose_node(udf_node);
-		vput(nvp);
+		vrele(nvp);
 
 		*vpp = NULL;
 		return error;
 	}
@@ -5892,11 +5887,8 @@ udf_create_node_raw(struct vnode *dvp, s
 
 error_out_unreserve:
 	udf_do_unreserve_space(ump, NULL, vpart_num, 1);
 
-error_out_unlock:
-	VOP_UNLOCK(nvp);
-
 error_out_unget:
 	nvp->v_data = NULL;
 	ungetnewvnode(nvp);
 
Index: sys/fs/union/union_subr.c
===================================================================
RCS file: /cvsroot/src/sys/fs/union/union_subr.c,v
retrieving revision 1.57
diff -p -u -4 -r1.57 union_subr.c
--- sys/fs/union/union_subr.c	17 Oct 2013 21:03:50 -0000	1.57
+++ sys/fs/union/union_subr.c	25 Dec 2013 08:04:08 -0000
@@ -933,8 +933,9 @@ union_vn_create(struct vnode **vpp, stru
 	error = VOP_CREATE(un->un_dirvp, &vp, &cn, vap);
 	if (error)
 		return error;
 
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	error = VOP_OPEN(vp, fmode, cred);
 	if (error) {
 		vput(vp);
 		return error;
Index: sys/fs/union/union_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/fs/union/union_vnops.c,v
retrieving revision 1.49
diff -p -u -4 -r1.49 union_vnops.c
--- sys/fs/union/union_vnops.c	21 Nov 2011 18:29:22 -0000	1.49
+++ sys/fs/union/union_vnops.c	25 Dec 2013 08:04:08 -0000
@@ -447,8 +447,13 @@ start:
 			if (upperdvp) {
 				VOP_UNLOCK(upperdvp);
 				uerror = union_mkshadow(um, upperdvp, cnp,
 				    &uppervp);
+				/*
+				 * XXX: lock upper node until lookup returns
+				 * unlocked nodes.
+				 */
+				vn_lock(uppervp, LK_EXCLUSIVE | LK_RETRY);
 				vn_lock(upperdvp, LK_EXCLUSIVE | LK_RETRY);
 				if (uerror == 0 && cnp->cn_nameiop != LOOKUP) {
 					vput(uppervp);
 					if (lowervp != NULLVP)
@@ -507,12 +512,15 @@ union_create(void *v)
 		error = VOP_CREATE(dvp, &vp, cnp, ap->a_vap);
 		if (error)
 			return (error);
 
+		/* XXX: lock upper node until lookup returns unlocked nodes. */
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		error = union_allocvp(ap->a_vpp, mp, NULLVP, NULLVP, cnp, vp,
 				NULLVP, 1);
+		VOP_UNLOCK(vp);
 		if (error)
-			vput(vp);
+			vrele(vp);
 		return (error);
 	}
 
 	vput(ap->a_dvp);
@@ -561,12 +569,15 @@ union_mknod(void *v)
 		error = VOP_MKNOD(dvp, &vp, cnp, ap->a_vap);
 		if (error)
 			return (error);
 
+		/* XXX: lock upper node until lookup returns unlocked nodes. */
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		error = union_allocvp(ap->a_vpp, mp, NULLVP, NULLVP,
 				      cnp, vp, NULLVP, 1);
+		VOP_UNLOCK(vp);
 		if (error)
-		    vput(vp);
+			vrele(vp);
 		return (error);
 	}
 
 	vput(ap->a_dvp);
@@ -1371,12 +1382,15 @@ union_mkdir(void *v)
 			vrele(ap->a_dvp);
 			return (error);
 		}
 
+		/* XXX: lock upper node until lookup returns unlocked nodes. */
+		vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		error = union_allocvp(ap->a_vpp, ap->a_dvp->v_mount, ap->a_dvp,
 				NULLVP, cnp, vp, NULLVP, 1);
+		VOP_UNLOCK(vp);
 		if (error)
-			vput(vp);
+			vrele(vp);
 		vrele(ap->a_dvp);
 		return (error);
 	}
 
Index: sys/fs/v7fs/v7fs_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/fs/v7fs/v7fs_vnops.c,v
retrieving revision 1.13
diff -p -u -4 -r1.13 v7fs_vnops.c
--- sys/fs/v7fs/v7fs_vnops.c	20 Nov 2013 23:44:23 -0000	1.13
+++ sys/fs/v7fs/v7fs_vnops.c	25 Dec 2013 08:04:08 -0000
@@ -238,8 +238,10 @@ v7fs_create(void *v)
 	newnode->update_atime = true;
 	DPRINTF("allocated %s->#%d\n", a->a_cnp->cn_nameptr, ino);
 
 unlock_exit:
+	if (a->a_vpp != NULL && error == 0)
+		VOP_UNLOCK(*a->a_vpp);
 	/* unlock parent directory */
 	vput(a->a_dvp);	/* locked at v7fs_lookup(); */
 
 	return error;
@@ -290,8 +292,10 @@ v7fs_mknod(void *v)
 	newnode->update_mtime = true;
 	newnode->update_atime = true;
 
 unlock_exit:
+	if (a->a_vpp != NULL && error == 0)
+		VOP_UNLOCK(*a->a_vpp);
 	vput(dvp);
 
 	return error;
 }
@@ -848,8 +852,10 @@ v7fs_mkdir(void *v)
 	newnode->update_mtime = true;
 	newnode->update_atime = true;
 
 unlock_exit:
+	if (a->a_vpp != NULL && error == 0)
+		VOP_UNLOCK(*a->a_vpp);
 	vput(dvp);
 
 	return error;
 }
@@ -1285,8 +1291,10 @@ v7fs_symlink(void *v)
 	newnode->update_ctime = true;
 	newnode->update_mtime = true;
 	newnode->update_atime = true;
 unlock_exit:
+	if (a->a_vpp != NULL && error == 0)
+		VOP_UNLOCK(*a->a_vpp);
 	/* unlock parent directory */
 	vput(a->a_dvp);
 
 	return error;
Index: sys/kern/uipc_usrreq.c
===================================================================
RCS file: /cvsroot/src/sys/kern/uipc_usrreq.c,v
retrieving revision 1.148
diff -p -u -4 -r1.148 uipc_usrreq.c
--- sys/kern/uipc_usrreq.c	29 Oct 2013 09:53:51 -0000	1.148
+++ sys/kern/uipc_usrreq.c	25 Dec 2013 08:04:08 -0000
@@ -965,8 +965,9 @@ unp_bind(struct socket *so, struct mbuf 
 		pathbuf_destroy(pb);
 		goto bad;
 	}
 	vp = nd.ni_vp;
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	solock(so);
 	vp->v_socket = unp->unp_socket;
 	unp->unp_vnode = vp;
 	unp->unp_addrlen = addrlen;
Index: sys/kern/vfs_syscalls.c
===================================================================
RCS file: /cvsroot/src/sys/kern/vfs_syscalls.c,v
retrieving revision 1.471
diff -p -u -4 -r1.471 vfs_syscalls.c
--- sys/kern/vfs_syscalls.c	27 Nov 2013 17:24:44 -0000	1.471
+++ sys/kern/vfs_syscalls.c	25 Dec 2013 08:04:08 -0000
@@ -2252,16 +2252,16 @@ do_sys_mknodat(struct lwp *l, int fdat, 
 		case VOP_MKNOD_DESCOFFSET:
 			error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp,
 						&nd.ni_cnd, &vattr);
 			if (error == 0)
-				vput(nd.ni_vp);
+				vrele(nd.ni_vp);
 			break;
 
 		case VOP_CREATE_DESCOFFSET:
 			error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp,
 						&nd.ni_cnd, &vattr);
 			if (error == 0)
-				vput(nd.ni_vp);
+				vrele(nd.ni_vp);
 			break;
 		}
 	} else {
 		VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
@@ -2340,9 +2340,9 @@ do_sys_mkfifoat(struct lwp *l, int fdat,
 	/* We will read cwdi->cwdi_cmask unlocked. */
 	vattr.va_mode = (mode & ALLPERMS) &~ p->p_cwdi->cwdi_cmask;
 	error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr);
 	if (error == 0)
-		vput(nd.ni_vp);
+		vrele(nd.ni_vp);
 	pathbuf_destroy(pb);
 	return (error);
 }
 
@@ -2497,9 +2497,9 @@ do_sys_symlinkat(struct lwp *l, const ch
 	/* We will read cwdi->cwdi_cmask unlocked. */
 	vattr.va_mode = ACCESSPERMS &~ p->p_cwdi->cwdi_cmask;
 	error = VOP_SYMLINK(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr, path);
 	if (error == 0)
-		vput(nd.ni_vp);
+		vrele(nd.ni_vp);
 out2:
 	pathbuf_destroy(linkpb);
 out1:
 	PNBUF_PUT(path);
@@ -4556,9 +4556,9 @@ do_sys_mkdirat(struct lwp *l, int fdat, 
 	/* We will read cwdi->cwdi_cmask unlocked. */
 	vattr.va_mode = (mode & ACCESSPERMS) &~ p->p_cwdi->cwdi_cmask;
 	error = VOP_MKDIR(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr);
 	if (!error)
-		vput(nd.ni_vp);
+		vrele(nd.ni_vp);
 	pathbuf_destroy(pb);
 	return (error);
 }
 
Index: sys/kern/vfs_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/kern/vfs_vnops.c,v
retrieving revision 1.186
diff -p -u -4 -r1.186 vfs_vnops.c
--- sys/kern/vfs_vnops.c	12 Nov 2012 11:00:07 -0000	1.186
+++ sys/kern/vfs_vnops.c	25 Dec 2013 08:04:08 -0000
@@ -187,8 +187,9 @@ vn_open(struct nameidata *ndp, int fmode
 			if (error)
 				goto out;
 			fmode &= ~O_TRUNC;
 			vp = ndp->ni_vp;
+			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 		} else {
 			VOP_ABORTOP(ndp->ni_dvp, &ndp->ni_cnd);
 			if (ndp->ni_dvp == ndp->ni_vp)
 				vrele(ndp->ni_dvp);
Index: sys/kern/vnode_if.src
===================================================================
RCS file: /cvsroot/src/sys/kern/vnode_if.src,v
retrieving revision 1.63
diff -p -u -4 -r1.63 vnode_if.src
--- sys/kern/vnode_if.src	14 Oct 2011 09:23:31 -0000	1.63
+++ sys/kern/vnode_if.src	25 Dec 2013 08:04:08 -0000
@@ -88,9 +88,9 @@ vop_lookup {
 };
 
 #
 #% create     dvp     L U U
-#% create     vpp     - L -
+#% create     vpp     - U -
 #
 #! create cnp	CREATE, LOCKPARENT
 #
 vop_create {
@@ -101,9 +101,9 @@ vop_create {
 };
 
 #
 #% mknod      dvp     L U U
-#% mknod      vpp     - L -
+#% mknod      vpp     - U -
 #
 #! mknod cnp	CREATE, LOCKPARENT
 #
 vop_mknod {
@@ -298,9 +298,9 @@ vop_rename {
 };
 
 #
 #% mkdir      dvp     L U U
-#% mkdir      vpp     - L - 
+#% mkdir      vpp     - U - 
 #
 #! mkdir cnp	CREATE, LOCKPARENT
 #
 vop_mkdir {
@@ -323,9 +323,9 @@ vop_rmdir {
 };
 
 #
 #% symlink    dvp     L U U
-#% symlink    vpp     - L -
+#% symlink    vpp     - U -
 #
 #! symlink cnp	CREATE, LOCKPARENT
 #
 vop_symlink {
Index: sys/miscfs/genfs/layer_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/miscfs/genfs/layer_vnops.c,v
retrieving revision 1.51
diff -p -u -4 -r1.51 layer_vnops.c
--- sys/miscfs/genfs/layer_vnops.c	10 Oct 2012 06:55:25 -0000	1.51
+++ sys/miscfs/genfs/layer_vnops.c	25 Dec 2013 08:04:08 -0000
@@ -315,18 +315,19 @@ layer_bypass(void *v)
 	if (descp->vdesc_vpp_offset != VDESC_NO_OFFSET && !error) {
 		vppp = VOPARG_OFFSETTO(struct vnode***,
 				 descp->vdesc_vpp_offset, ap);
 		/*
-		 * Only vop_lookup, vop_create, vop_makedir, vop_bmap,
-		 * vop_mknod, and vop_symlink return vpp's. vop_bmap
-		 * doesn't call bypass as the lower vpp is fine (we're just
-		 * going to do i/o on it). vop_lookup doesn't call bypass
+		 * Only vop_lookup, vop_create, vop_makedir, vop_mknod
+		 * and vop_symlink return vpp's. vop_lookup doesn't call bypass
 		 * as a lookup on "." would generate a locking error.
-		 * So all the calls which get us here have a locked vpp. :-)
+		 * So all the calls which get us here have a unlocked vpp. :-)
 		 */
+		/* XXX: lock node until lookup returns unlocked nodes. */
+		vn_lock(**vppp, LK_EXCLUSIVE | LK_RETRY);
 		error = layer_node_create(mp, **vppp, *vppp);
+		VOP_UNLOCK(**vppp);
 		if (error) {
-			vput(**vppp);
+			vrele(**vppp);
 			**vppp = NULL;
 		}
 	}
 	return error;
Index: sys/nfs/nfs_serv.c
===================================================================
RCS file: /cvsroot/src/sys/nfs/nfs_serv.c,v
retrieving revision 1.168
diff -p -u -4 -r1.168 nfs_serv.c
--- sys/nfs/nfs_serv.c	14 Dec 2013 22:04:03 -0000	1.168
+++ sys/nfs/nfs_serv.c	25 Dec 2013 08:04:09 -0000
@@ -1505,8 +1505,9 @@ nfsrv_create(struct nfsrv_descript *nfsd
 		if (va.va_type == VREG || va.va_type == VSOCK) {
 			nqsrv_getl(nd.ni_dvp, ND_WRITE);
 			error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &va);
 			if (!error) {
+				vn_lock(nd.ni_vp, LK_EXCLUSIVE | LK_RETRY);
 				if (exclusive_flag) {
 					exclusive_flag = 0;
 					vattr_null(&va);
 					/*
@@ -1539,9 +1540,11 @@ nfsrv_create(struct nfsrv_descript *nfsd
 				va.va_rdev = (dev_t)rdev;
 			nqsrv_getl(nd.ni_dvp, ND_WRITE);
 			error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd,
 			    &va);
-			if (error) {
+			if (!error) {
+				vn_lock(nd.ni_vp, LK_EXCLUSIVE | LK_RETRY);
+			} else {
 				nfsm_reply(0);
 			}
 		} else {
 			VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
@@ -1749,8 +1752,11 @@ abort:
 		error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &va);
 		if (error)
 			goto out;
 	}
+	if (!error) {
+		vn_lock(nd.ni_vp, LK_EXCLUSIVE | LK_RETRY);
+	}
 out:
 	vp = nd.ni_vp;
 	if (!error) {
 		error = nfsrv_composefh(vp, &nsfh, true);
@@ -2341,14 +2347,15 @@ abortop:
 	nqsrv_getl(nd.ni_dvp, ND_WRITE);
 	error = VOP_SYMLINK(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &va, pathcp);
 	if (!error) {
 	    if (v3) {
+		vn_lock(nd.ni_vp, LK_SHARED | LK_RETRY);
 		error = nfsrv_composefh(nd.ni_vp, &nsfh, v3);
 		if (!error)
 		    error = VOP_GETATTR(nd.ni_vp, &va, cred);
 		vput(nd.ni_vp);
 	    } else {
-		vput(nd.ni_vp);
+		vrele(nd.ni_vp);
 	    }
 	}
 out:
 	if (pathcp)
@@ -2469,8 +2476,9 @@ nfsrv_mkdir(struct nfsrv_descript *nfsd,
 	nqsrv_getl(nd.ni_dvp, ND_WRITE);
 	error = VOP_MKDIR(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &va);
 	if (!error) {
 		vp = nd.ni_vp;
+		vn_lock(vp, LK_SHARED | LK_RETRY);
 		error = nfsrv_composefh(vp, &nsfh, v3);
 		if (!error)
 			error = VOP_GETATTR(vp, &va, cred);
 		vput(vp);
Index: sys/nfs/nfs_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/nfs/nfs_vnops.c,v
retrieving revision 1.301
diff -p -u -4 -r1.301 nfs_vnops.c
--- sys/nfs/nfs_vnops.c	15 Nov 2013 14:39:53 -0000	1.301
+++ sys/nfs/nfs_vnops.c	25 Dec 2013 08:04:09 -0000
@@ -1549,8 +1549,9 @@ nfs_mknodrpc(struct vnode *dvp, struct v
 			vput(newvp);
 	} else {
 		nfs_cache_enter(dvp, newvp, cnp);
 		*vpp = newvp;
+		VOP_UNLOCK(newvp);
 	}
 	VTONFS(dvp)->n_flag |= NMODIFIED;
 	if (!wccflag)
 		NFS_INVALIDATE_ATTRCACHE(VTONFS(dvp));
@@ -1707,8 +1708,9 @@ again:
 			nfs_cache_enter(dvp, newvp, cnp);
 		else
 			cache_purge1(dvp, cnp->cn_nameptr, cnp->cn_namelen, 0);
 		*ap->a_vpp = newvp;
+		VOP_UNLOCK(newvp);
 	} else {
 		if (newvp)
 			vput(newvp);
 		if (error == EEXIST)
@@ -2158,8 +2160,9 @@ nfs_symlink(void *v)
 		if (newvp != NULL)
 			vput(newvp);
 	} else {
 		*ap->a_vpp = newvp;
+		VOP_UNLOCK(newvp);
 	}
 	VTONFS(dvp)->n_flag |= NMODIFIED;
 	if (!wccflag)
 		NFS_INVALIDATE_ATTRCACHE(VTONFS(dvp));
@@ -2253,8 +2256,9 @@ nfs_mkdir(void *v)
 	} else {
 		VN_KNOTE(dvp, NOTE_WRITE | NOTE_LINK);
 		nfs_cache_enter(dvp, newvp, cnp);
 		*ap->a_vpp = newvp;
+		VOP_UNLOCK(newvp);
 	}
 	vput(dvp);
 	return (error);
 }
Index: sys/rump/librump/rumpvfs/rumpfs.c
===================================================================
RCS file: /cvsroot/src/sys/rump/librump/rumpvfs/rumpfs.c,v
retrieving revision 1.121
diff -p -u -4 -r1.121 rumpfs.c
--- sys/rump/librump/rumpvfs/rumpfs.c	23 Nov 2013 13:35:36 -0000	1.121
+++ sys/rump/librump/rumpvfs/rumpfs.c	25 Dec 2013 08:04:09 -0000
@@ -564,9 +564,10 @@ makeprivate(enum vtype vt, mode_t mode, 
 	return rn;
 }
 
 static int
-makevnode(struct mount *mp, struct rumpfs_node *rn, struct vnode **vpp)
+makevnode(struct mount *mp, struct rumpfs_node *rn, struct vnode **vpp,
+    bool lock_result)
 {
 	struct vnode *vp;
 	int (**vpops)(void *);
 	struct vattr *va = &rn->rn_va;
@@ -592,9 +593,10 @@ makevnode(struct mount *mp, struct rumpf
 	}
 	vp->v_data = rn;
 
 	genfs_node_init(vp, &rumpfs_genfsops);
-	vn_lock(vp, LK_RETRY | LK_EXCLUSIVE);
+	if (lock_result)
+		vn_lock(vp, LK_RETRY | LK_EXCLUSIVE);
 	mutex_enter(&reclock);
 	rn->rn_vp = vp;
 	mutex_exit(&reclock);
 
@@ -810,9 +812,9 @@ rump_vop_lookup(void *v)
 		}
 		*vpp = vp;
 	} else {
 		mutex_exit(&reclock);
-		rv = makevnode(dvp->v_mount, rn, vpp);
+		rv = makevnode(dvp->v_mount, rn, vpp, true);
 	}
 	if (dotdot)
 		vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
 
@@ -1009,9 +1011,9 @@ rump_vop_mkdir(void *v)
 	rn = makeprivate(VDIR, va->va_mode & ALLPERMS, NODEV, DEV_BSIZE, false);
 	if ((cnp->cn_flags & ISWHITEOUT) != 0)
 		rn->rn_va.va_flags |= UF_OPAQUE;
 	rn->rn_parent = rnd;
-	rv = makevnode(dvp->v_mount, rn, vpp);
+	rv = makevnode(dvp->v_mount, rn, vpp, false);
 	if (rv)
 		goto out;
 
 	makedir(rnd, cnp, rn);
@@ -1107,9 +1109,9 @@ rump_vop_mknod(void *v)
 	rn = makeprivate(va->va_type, va->va_mode & ALLPERMS, va->va_rdev,
 	    DEV_BSIZE, false);
 	if ((cnp->cn_flags & ISWHITEOUT) != 0)
 		rn->rn_va.va_flags |= UF_OPAQUE;
-	rv = makevnode(dvp->v_mount, rn, vpp);
+	rv = makevnode(dvp->v_mount, rn, vpp, false);
 	if (rv)
 		goto out;
 
 	makedir(rnd, cnp, rn);
@@ -1140,9 +1142,9 @@ rump_vop_create(void *v)
 	rn = makeprivate(va->va_type, va->va_mode & ALLPERMS, NODEV,
 	    newsize, false);
 	if ((cnp->cn_flags & ISWHITEOUT) != 0)
 		rn->rn_va.va_flags |= UF_OPAQUE;
-	rv = makevnode(dvp->v_mount, rn, vpp);
+	rv = makevnode(dvp->v_mount, rn, vpp, false);
 	if (rv)
 		goto out;
 
 	makedir(rnd, cnp, rn);
@@ -1175,9 +1177,9 @@ rump_vop_symlink(void *v)
 	KASSERT(linklen < MAXPATHLEN);
 	rn = makeprivate(VLNK, va->va_mode & ALLPERMS, NODEV, linklen, false);
 	if ((cnp->cn_flags & ISWHITEOUT) != 0)
 		rn->rn_va.va_flags |= UF_OPAQUE;
-	rv = makevnode(dvp->v_mount, rn, vpp);
+	rv = makevnode(dvp->v_mount, rn, vpp, false);
 	if (rv)
 		goto out;
 
 	makedir(rnd, cnp, rn);
@@ -1764,9 +1766,9 @@ rumpfs_mountfs(struct mount *mp)
 	rfsmp = kmem_alloc(sizeof(*rfsmp), KM_SLEEP);
 
 	rn = makeprivate(VDIR, RUMPFS_DEFAULTMODE, NODEV, DEV_BSIZE, false);
 	rn->rn_parent = rn;
-	if ((error = makevnode(mp, rn, &rfsmp->rfsmp_rvp)) != 0)
+	if ((error = makevnode(mp, rn, &rfsmp->rfsmp_rvp, true)) != 0)
 		return error;
 
 	rfsmp->rfsmp_rvp->v_vflag |= VV_ROOT;
 	VOP_UNLOCK(rfsmp->rfsmp_rvp);
Index: sys/ufs/chfs/chfs_vnode.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/chfs/chfs_vnode.c,v
retrieving revision 1.8
diff -p -u -4 -r1.8 chfs_vnode.c
--- sys/ufs/chfs/chfs_vnode.c	19 Oct 2012 12:44:39 -0000	1.8
+++ sys/ufs/chfs/chfs_vnode.c	25 Dec 2013 08:04:09 -0000
@@ -300,8 +300,9 @@ chfs_makeinode(int mode, struct vnode *d
 	pdir->chvc->nlink++;
 
 	mutex_exit(&chmp->chm_lock_mountfields);
 
+	VOP_UNLOCK(vp);
 	*vpp = vp;
 	return (0);
 }
 
Index: sys/ufs/chfs/chfs_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/chfs/chfs_vnops.c,v
retrieving revision 1.18
diff -p -u -4 -r1.18 chfs_vnops.c
--- sys/ufs/chfs/chfs_vnops.c	20 Oct 2013 17:18:38 -0000	1.18
+++ sys/ufs/chfs/chfs_vnops.c	25 Dec 2013 08:04:09 -0000
@@ -1314,9 +1314,9 @@ chfs_symlink(void *v)
 	}
 
 out:
 	if (err)
-		vput(vp);
+		vrele(vp);
 
 	return (err);
 }
 
Index: sys/ufs/ext2fs/ext2fs_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ext2fs/ext2fs_vnops.c,v
retrieving revision 1.107
diff -p -u -4 -r1.107 ext2fs_vnops.c
--- sys/ufs/ext2fs/ext2fs_vnops.c	18 Mar 2013 19:35:47 -0000	1.107
+++ sys/ufs/ext2fs/ext2fs_vnops.c	25 Dec 2013 08:04:09 -0000
@@ -140,8 +140,9 @@ ext2fs_create(void *v)
 
 	if (error)
 		return (error);
 	VN_KNOTE(ap->a_dvp, NOTE_WRITE);
+	VOP_UNLOCK(*ap->a_vpp);
 	return (0);
 }
 
 /*
@@ -183,16 +184,17 @@ ext2fs_mknod(void *v)
 	 * Remove inode so that it will be reloaded by VFS_VGET and
 	 * checked to see if it is an alias of an existing entry in
 	 * the inode cache.
 	 */
-	VOP_UNLOCK(*vpp);
 	(*vpp)->v_type = VNON;
+	VOP_UNLOCK(*vpp);
 	vgone(*vpp);
 	error = VFS_VGET(mp, ino, vpp);
 	if (error != 0) {
 		*vpp = NULL;
 		return (error);
 	}
+	VOP_UNLOCK(*vpp);
 	return (0);
 }
 
 /*
@@ -764,8 +766,9 @@ bad:
 		ip->i_flag |= IN_CHANGE;
 		vput(tvp);
 	} else {
 		VN_KNOTE(dvp, NOTE_WRITE | NOTE_LINK);
+		VOP_UNLOCK(tvp);
 		*ap->a_vpp = tvp;
 	}
 out:
 	vput(dvp);
@@ -898,10 +901,11 @@ ext2fs_symlink(void *v)
 		error = vn_rdwr(UIO_WRITE, vp, ap->a_target, len, (off_t)0,
 		    UIO_SYSSPACE, IO_NODELOCKED, ap->a_cnp->cn_cred,
 		    (size_t *)0, NULL);
 bad:
+	VOP_UNLOCK(vp);
 	if (error)
-		vput(vp);
+		vrele(vp);
 	return (error);
 }
 
 /*
Index: sys/ufs/lfs/lfs_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/lfs/lfs_vnops.c,v
retrieving revision 1.259
diff -p -u -4 -r1.259 lfs_vnops.c
--- sys/ufs/lfs/lfs_vnops.c	18 Oct 2013 15:15:22 -0000	1.259
+++ sys/ufs/lfs/lfs_vnops.c	25 Dec 2013 08:04:09 -0000
@@ -662,8 +662,9 @@ lfs_mknod(void *v)
 	if (error != 0) {
 		*vpp = NULL;
 		return (error);
 	}
+	VOP_UNLOCK(*vpp);
 	return (0);
 }
 
 int
Index: sys/ufs/lfs/ulfs_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/lfs/ulfs_vnops.c,v
retrieving revision 1.18
diff -p -u -4 -r1.18 ulfs_vnops.c
--- sys/ufs/lfs/ulfs_vnops.c	28 Jul 2013 01:10:49 -0000	1.18
+++ sys/ufs/lfs/ulfs_vnops.c	25 Dec 2013 08:04:09 -0000
@@ -150,8 +150,9 @@ ulfs_create(void *v)
 		return (error);
 	}
 	fstrans_done(dvp->v_mount);
 	VN_KNOTE(dvp, NOTE_WRITE);
+	VOP_UNLOCK(*ap->a_vpp);
 	return (0);
 }
 
 /*
@@ -840,8 +841,9 @@ ulfs_mkdir(void *v)
 	pool_cache_put(ulfs_direct_cache, newdir);
  bad:
 	if (error == 0) {
 		VN_KNOTE(dvp, NOTE_WRITE | NOTE_LINK);
+		VOP_UNLOCK(tvp);
 	} else {
 		dp->i_nlink--;
 		DIP_ASSIGN(dp, nlink, dp->i_nlink);
 		dp->i_flag |= IN_CHANGE;
@@ -997,10 +999,11 @@ ulfs_symlink(void *v)
 	} else
 		error = vn_rdwr(UIO_WRITE, vp, ap->a_target, len, (off_t)0,
 		    UIO_SYSSPACE, IO_NODELOCKED | IO_JOURNALLOCKED,
 		    ap->a_cnp->cn_cred, NULL, NULL);
+	VOP_UNLOCK(vp);
 	if (error)
-		vput(vp);
+		vrele(vp);
 out:
 	fstrans_done(ap->a_dvp->v_mount);
 	return (error);
 }
Index: sys/ufs/ufs/ufs_vnops.c
===================================================================
RCS file: /cvsroot/src/sys/ufs/ufs/ufs_vnops.c,v
retrieving revision 1.218
diff -p -u -4 -r1.218 ufs_vnops.c
--- sys/ufs/ufs/ufs_vnops.c	15 Sep 2013 15:32:18 -0000	1.218
+++ sys/ufs/ufs/ufs_vnops.c	25 Dec 2013 08:04:09 -0000
@@ -162,8 +162,9 @@ ufs_create(void *v)
 	}
 	UFS_WAPBL_END1(dvp->v_mount, dvp);
 	fstrans_done(dvp->v_mount);
 	VN_KNOTE(dvp, NOTE_WRITE);
+	VOP_UNLOCK(*ap->a_vpp);
 	return (0);
 }
 
 /*
@@ -237,8 +238,9 @@ out:
 	if (error != 0) {
 		*vpp = NULL;
 		return (error);
 	}
+	VOP_UNLOCK(*vpp);
 	return (0);
 }
 
 /*
@@ -1101,8 +1103,9 @@ ufs_mkdir(void *v)
 	pool_cache_put(ufs_direct_cache, newdir);
  bad:
 	if (error == 0) {
 		VN_KNOTE(dvp, NOTE_WRITE | NOTE_LINK);
+		VOP_UNLOCK(tvp);
 		UFS_WAPBL_END(dvp->v_mount);
 	} else {
 		dp->i_nlink--;
 		DIP_ASSIGN(dp, nlink, dp->i_nlink);
@@ -1283,10 +1286,11 @@ ufs_symlink(void *v)
 		error = vn_rdwr(UIO_WRITE, vp, ap->a_target, len, (off_t)0,
 		    UIO_SYSSPACE, IO_NODELOCKED | IO_JOURNALLOCKED,
 		    ap->a_cnp->cn_cred, NULL, NULL);
 	UFS_WAPBL_END1(ap->a_dvp->v_mount, ap->a_dvp);
+	VOP_UNLOCK(vp);
 	if (error)
-		vput(vp);
+		vrele(vp);
 out:
 	fstrans_done(ap->a_dvp->v_mount);
 	return (error);
 }
