 @@ -1,14 +1,14 @@
-/*	$NetBSD: advfsops.c,v 1.73 2015/03/28 19:24:05 maxv Exp $	*/
+/*	$NetBSD: advfsops.c,v 1.74 2015/04/20 13:44:16 riastradh Exp $	*/
 /*
  * Copyright (c) 1994 Christian E. Hopps
  * Copyright (c) 1996 Matthias Scheler
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.73 2015/03/28 19:24:05 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.74 2015/04/20 13:44:16 riastradh Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/malloc.h>
 @@ -354,27 +354,27 @@ adosfs_statvfs(struct mount *mp, struct
 	sbp->f_bfree = amp->freeblks;
 	sbp->f_bavail = amp->freeblks;
 	sbp->f_bresvd = 0;
 	sbp->f_files = 0;		/* who knows */
 	sbp->f_ffree = 0;		/* " " */
 	sbp->f_favail = 0;		/* " " */
 	sbp->f_fresvd = 0;
 	copy_statvfs_info(sbp, mp);
 	return (0);
+}
 /*
  * lookup an anode, if not found, create
- * return locked and referenced al la vget(vp, LK_EXCLUSIVE);
+ * return locked and referenced
  */
 int
 adosfs_vget(struct mount *mp, ino_t an, struct vnode **vpp)
+{
 	int error;
 	error = vcache_get(mp, &an, sizeof(an), vpp);
 	if (error)
 		return error;
 	error = vn_lock(*vpp, LK_EXCLUSIVE);
 	if (error) {
 		vrele(*vpp);
 		*vpp = NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tmpfs_subr.c,v 1.97 2014/09/08 14:49:46 gson Exp $	*/
+/*	$NetBSD: tmpfs_subr.c,v 1.98 2015/04/20 13:44:16 riastradh Exp $	*/
 /*
  * Copyright (c) 2005-2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal, developed as part of Google's Summer of Code
  * 2005 program, and by Mindaugas Rasiukevicius.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -64,27 +64,27 @@
  *	If an inode has references within the file system (tn_links > 0) and
  *	its inactive vnode gets reclaimed/recycled - then the association is
  *	broken in tmpfs_reclaim().  In such case, an inode will always pass
  *	tmpfs_lookup() and thus tmpfs_vnode_get() to associate a new vnode.
+ *
  * Lock order
+ *
  *	tmpfs_node_t::tn_vlock ->
  *		vnode_t::v_vlock ->
  *			vnode_t::v_interlock
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.97 2014/09/08 14:49:46 gson Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_subr.c,v 1.98 2015/04/20 13:44:16 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/cprng.h>
 #include <sys/dirent.h>
 #include <sys/event.h>
 #include <sys/kmem.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #include <sys/kauth.h>
 @@ -272,31 +272,32 @@ tmpfs_free_node(tmpfs_mount_t *tmp, tmpf
  */
 int
 tmpfs_vnode_get(struct mount *mp, tmpfs_node_t *node, vnode_t **vpp)
+{
 	vnode_t *vp;
 	kmutex_t *slock;
 	int error;
 again:
 	/* If there is already a vnode, try to reclaim it. */
 	if ((vp = node->tn_vnode) != NULL) {
 		atomic_or_32(&node->tn_gen, TMPFS_RECLAIMING_BIT);
 		mutex_enter(vp->v_interlock);
 		mutex_exit(&node->tn_vlock);
-		error = vget(vp, LK_EXCLUSIVE);
+		error = vget(vp, 0, true /* wait */);
 		if (error == ENOENT) {
 			mutex_enter(&node->tn_vlock);
 			goto again;
+		}
 		vn_lock(vp, LK_EXCLUSIVE);
 		atomic_and_32(&node->tn_gen, ~TMPFS_RECLAIMING_BIT);
 		*vpp = vp;
 		return error;
+	}
 	if (TMPFS_NODE_RECLAIMING(node)) {
 		atomic_and_32(&node->tn_gen, ~TMPFS_RECLAIMING_BIT);
+	}
 	/*
 	 * Get a new vnode and associate it with our inode.  Share the
 	 * lock with underlying UVM object, if there is one (VREG case).
 	 */
 	if (node->tn_type == VREG) {

 @@ -1,14 +1,14 @@
-/* $NetBSD: udf_subr.c,v 1.129 2015/04/06 08:39:23 hannken Exp $ */
+/* $NetBSD: udf_subr.c,v 1.130 2015/04/20 13:44:16 riastradh Exp $ */
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * IN NO EVENT SHALL THE AUTHOR 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.
+ *
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.129 2015/04/06 08:39:23 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.130 2015/04/20 13:44:16 riastradh Exp $");
 #endif /* not lint */
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 @@ -6351,34 +6351,42 @@ derailed:
 		/* check if its dirty enough to even try */
 		on_type  = (waitfor == MNT_LAZY || vp->v_type == VNON);
 		on_flags = ((udf_node->i_flags &
 			(IN_ACCESSED | IN_UPDATE | IN_MODIFIED)) == 0);
 		on_vnode = LIST_EMPTY(&vp->v_dirtyblkhd)
 			&& UVM_OBJ_IS_CLEAN(&vp->v_uobj);
 		if (on_type || (on_flags || on_vnode)) { /* XXX */
 			/* not dirty (enough?) */
 			mutex_exit(vp->v_interlock);
 			continue;
+		}
 		mutex_exit(&mntvnode_lock);
-		error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT);
+		error = vget(vp, LK_NOWAIT, false /* !wait */);
 		if (error) {
 			mutex_enter(&mntvnode_lock);
 			if (error == ENOENT)
 				goto derailed;
 			*ndirty += 1;
 			continue;
+		}
 		error = vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT);
 		if (error) {
 			KASSERT(error == EBUSY);
 			vrele(vp);
 			mutex_enter(&mntvnode_lock);
 			*ndirty += 1;
 			continue;
+		}
 		switch (pass) {
 		case 1:
 			VOP_FSYNC(vp, cred, 0 | FSYNC_DATAONLY,0,0);
 			break;
 		case 2:
 			vdirty = vp->v_numoutput;
 			if (vp->v_tag == VT_UDF)
 				vdirty += udf_node->outstanding_bufs +
 					udf_node->outstanding_nodedscr;
 			if (vdirty == 0)
 				VOP_FSYNC(vp, cred, 0,0,0);
 			*ndirty += vdirty;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: union_subr.c,v 1.71 2015/02/24 16:08:01 hannken Exp $	*/
+/*	$NetBSD: union_subr.c,v 1.72 2015/04/20 13:44:16 riastradh Exp $	*/
 /*
  * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -62,27 +62,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.
+ *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.71 2015/02/24 16:08:01 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_subr.c,v 1.72 2015/04/20 13:44:16 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
 #include <sys/malloc.h>
 #include <sys/dirent.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/queue.h>
 @@ -981,27 +981,27 @@ union_removed_upper(struct union_node *u
 		LIST_REMOVE(un, un_cache);
+	}
 	mutex_exit(&uhash_lock);
+}
 #if 0
 struct vnode *
 union_lowervp(struct vnode *vp)
+{
 	struct union_node *un = VTOUNION(vp);
 	if ((un->un_lowervp != NULLVP) &&
 	    (vp->v_type == un->un_lowervp->v_type)) {
-		if (vget(un->un_lowervp, 0) == 0)
+		if (vget(un->un_lowervp, 0, true /* wait */) == 0)
 			return (un->un_lowervp);
+	}
 	return (NULLVP);
+}
 #endif
 /*
  * determine whether a whiteout is needed
  * during a remove/rmdir operation.
  */
 int
 union_dowhiteout(struct union_node *un, kauth_cred_t cred)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_cache.c,v 1.105 2015/01/16 20:10:25 dennis Exp $	*/
+/*	$NetBSD: vfs_cache.c,v 1.106 2015/04/20 13:44:16 riastradh Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -48,27 +48,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_cache.c	8.3 (Berkeley) 8/22/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.105 2015/01/16 20:10:25 dennis Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.106 2015/04/20 13:44:16 riastradh Exp $");
 #include "opt_ddb.h"
 #include "opt_revcache.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
 #include <sys/errno.h>
 #include <sys/pool.h>
 @@ -545,27 +545,27 @@ cache_lookup(struct vnode *dvp, const ch
 		mutex_exit(&ncp->nc_lock);
 		mutex_exit(&cpup->cpu_lock);
 		return ret_value;
+	}
 	vp = ncp->nc_vp;
 	mutex_enter(vp->v_interlock);
 	mutex_exit(&ncp->nc_lock);
 	mutex_exit(&cpup->cpu_lock);
 	/*
 	 * Unlocked except for the vnode interlock.  Call vget().
 	 */
-	error = vget(vp, LK_NOWAIT);
+	error = vget(vp, LK_NOWAIT, false /* !wait */);
 	if (error) {
 		KASSERT(error == EBUSY);
 		/*
 		 * This vnode is being cleaned out.
 		 * XXX badhits?
 		 */
 		COUNT_UNL(cpup, ncs_falsehits);
 		/* found nothing */
 		return 0;
+	}
 	COUNT_UNL(cpup, ncs_goodhits);
 	/* found it */
 @@ -626,27 +626,27 @@ cache_lookup_raw(struct vnode *dvp, cons
 		COUNT(cpup, ncs_neghits);
 		mutex_exit(&ncp->nc_lock);
 		mutex_exit(&cpup->cpu_lock);
 		/* found negative entry; vn is already null from above */
 		return 1;
+	}
 	mutex_enter(vp->v_interlock);
 	mutex_exit(&ncp->nc_lock);
 	mutex_exit(&cpup->cpu_lock);
 	/*
 	 * Unlocked except for the vnode interlock.  Call vget().
 	 */
-	error = vget(vp, LK_NOWAIT);
+	error = vget(vp, LK_NOWAIT, false /* !wait */);
 	if (error) {
 		KASSERT(error == EBUSY);
 		/*
 		 * This vnode is being cleaned out.
 		 * XXX badhits?
 		 */
 		COUNT_UNL(cpup, ncs_falsehits);
 		/* found nothing */
 		return 0;
+	}
 	COUNT_UNL(cpup, ncs_goodhits); /* XXX can be "badhits" */
 	/* found it */
 @@ -714,27 +714,27 @@ cache_revlookup(struct vnode *vp, struct
 				if (bp <= bufp) {
 					*dvpp = NULL;
 					mutex_exit(&ncp->nc_lock);
 					mutex_exit(namecache_lock);
 					return (ERANGE);
+				}
 				memcpy(bp, ncp->nc_name, nlen);
 				*bpp = bp;
+			}
 			mutex_enter(dvp->v_interlock);
 			mutex_exit(&ncp->nc_lock);
 			mutex_exit(namecache_lock);
-			error = vget(dvp, LK_NOWAIT);
+			error = vget(dvp, LK_NOWAIT, false /* !wait */);
 			if (error) {
 				KASSERT(error == EBUSY);
 				if (bufp)
 					(*bpp) += nlen;
 				*dvpp = NULL;
 				return -1;
+			}
 			*dvpp = dvp;
 			return (0);
+		}
 		mutex_exit(&ncp->nc_lock);
+	}
 	COUNT(cpup, ncs_revmiss);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_mount.c,v 1.33 2015/03/09 15:35:11 pooka Exp $	*/
+/*	$NetBSD: vfs_mount.c,v 1.34 2015/04/20 13:44:16 riastradh Exp $	*/
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Charles M. Hannum, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -57,27 +57,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_subr.c	8.13 (Berkeley) 4/18/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.33 2015/03/09 15:35:11 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.34 2015/04/20 13:44:16 riastradh Exp $");
 #define _VFS_VNODE_PRIVATE
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/filedesc.h>
 #include <sys/device.h>
 #include <sys/kauth.h>
 @@ -394,27 +394,27 @@ again:
 	       		return NULL;
+		}
 		mutex_enter(vp->v_interlock);
 		if (ISSET(vp->v_iflag, VI_MARKER) ||
 		    (f && !ISSET(vp->v_iflag, VI_XLOCK) && !(*f)(cl, vp))) {
 			mutex_exit(vp->v_interlock);
 			vp = TAILQ_NEXT(vp, v_mntvnodes);
 			goto again;
+		}
 		TAILQ_INSERT_AFTER(&mp->mnt_vnodelist, vp, mvp, v_mntvnodes);
 		mvp->v_usecount = 1;
 		mutex_exit(&mntvnode_lock);
-		error = vget(vp, 0);
+		error = vget(vp, 0, true /* wait */);
 		KASSERT(error == 0 || error == ENOENT);
 	} while (error != 0);
 	return vp;
+}
 /*
  * Move a vnode from one mount queue to another.
  */
 void
 vfs_insmntque(vnode_t *vp, struct mount *mp)
+{
 	struct mount *omp;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_vnode.c,v 1.40 2015/03/17 09:38:21 hannken Exp $	*/
+/*	$NetBSD: vfs_vnode.c,v 1.41 2015/04/20 13:44:16 riastradh Exp $	*/
 /*-
  * Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Charles M. Hannum, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -106,27 +106,27 @@
  *	from zero, the interlock must be held.  To change from a non-zero
  *	value to zero, again the interlock must be held.
+ *
  *	Changing the usecount from a non-zero value to a non-zero value can
  *	safely be done using atomic operations, without the interlock held.
+ *
  *	Note: if VI_CLEAN is set, vnode_t::v_interlock will be released while
  *	mntvnode_lock is still held.
+ *
  *	See PR 41374.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.40 2015/03/17 09:38:21 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.41 2015/04/20 13:44:16 riastradh Exp $");
 #define _VFS_VNODE_PRIVATE
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/hash.h>
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 @@ -508,33 +508,34 @@ vremfree(vnode_t *vp)
 /*
  * vget: get a particular vnode from the free list, increment its reference
  * count and lock it.
+ *
  * => Should be called with v_interlock held.
+ *
  * If VI_CHANGING is set, the vnode may be eliminated in vgone()/vclean().
  * In that case, we cannot grab the vnode, so the process is awakened when
  * the transition is completed, and an error returned to indicate that the
  * vnode is no longer usable.
  */
 int
-vget(vnode_t *vp, int flags)
+vget(vnode_t *vp, int flags, bool waitok)
+{
 	int error = 0;
 	KASSERT((vp->v_iflag & VI_MARKER) == 0);
 	KASSERT(mutex_owned(vp->v_interlock));
-	KASSERT((flags & ~(LK_SHARED|LK_EXCLUSIVE|LK_NOWAIT)) == 0);
+	KASSERT((flags & ~LK_NOWAIT) == 0);
 	KASSERT(waitok == ((flags & LK_NOWAIT) == 0));
 	/*
 	 * Before adding a reference, we must remove the vnode
 	 * from its freelist.
 	 */
 	if (vp->v_usecount == 0) {
 		vremfree(vp);
 		vp->v_usecount = 1;
 	} else {
 		atomic_inc_uint(&vp->v_usecount);
+	}
 	/*
 @@ -545,36 +546,30 @@ vget(vnode_t *vp, int flags)
 	if ((vp->v_iflag & VI_CHANGING) != 0) {
 		if ((flags & LK_NOWAIT) != 0) {
 			vrelel(vp, 0);
 			return EBUSY;
+		}
 		vwait(vp, VI_CHANGING);
 		if ((vp->v_iflag & VI_CLEAN) != 0) {
 			vrelel(vp, 0);
 			return ENOENT;
+		}
+	}
 	/*
-	 * Ok, we got it in good shape.  Just locking left.
+	 * Ok, we got it in good shape.
 	 */
 	KASSERT((vp->v_iflag & VI_CLEAN) == 0);
 	mutex_exit(vp->v_interlock);
 	if (flags & (LK_EXCLUSIVE | LK_SHARED)) {
 		error = vn_lock(vp, flags);
 		if (error != 0) {
 			vrele(vp);
 	return error;
+}
 /*
  * vput: unlock and release the reference.
  */
 void
 vput(vnode_t *vp)
+{
 	KASSERT((vp->v_iflag & VI_MARKER) == 0);
 	VOP_UNLOCK(vp);
 @@ -1237,27 +1232,27 @@ vcache_get(struct mount *mp, const void
 	vcache_key.vk_key = key;
 	vcache_key.vk_key_len = key_len;
 	hash = vcache_hash(&vcache_key);
 again:
 	mutex_enter(&vcache.lock);
 	node = vcache_hash_lookup(&vcache_key, hash);
 	/* If found, take a reference or retry. */
 	if (__predict_true(node != NULL && node->vn_vnode != NULL)) {
 		vp = node->vn_vnode;
 		mutex_enter(vp->v_interlock);
 		mutex_exit(&vcache.lock);
-		error = vget(vp, 0);
+		error = vget(vp, 0, true /* wait */);
 		if (error == ENOENT)
 			goto again;
 		if (error == 0)
 			*vpp = vp;
 		KASSERT((error != 0) == (*vpp == NULL));
 		return error;
+	}
 	/* If another thread loads this node, wait and retry. */
 	if (node != NULL) {
 		KASSERT(node->vn_vnode == NULL);
 		mutex_exit(&vcache.lock);
 		kpause("vcache", false, mstohz(20), NULL);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: spec_vnops.c,v 1.146 2015/03/28 19:24:06 maxv Exp $	*/
+/*	$NetBSD: spec_vnops.c,v 1.147 2015/04/20 13:44:16 riastradh Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -48,27 +48,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.
+ *
  *	@(#)spec_vnops.c	8.15 (Berkeley) 7/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.146 2015/03/28 19:24:06 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.147 2015/04/20 13:44:16 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/stat.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 @@ -299,27 +299,27 @@ spec_node_lookup_by_dev(enum vtype type,
 	if (vp == NULL) {
 		mutex_exit(&device_lock);
 		return ENOENT;
+	}
 	/*
 	 * If it is an opened block device return the opened vnode.
 	 */
 	if (type == VBLK && vp->v_specnode->sn_dev->sd_bdevvp != NULL) {
 		mutex_exit(vp->v_interlock);
 		vp = vp->v_specnode->sn_dev->sd_bdevvp;
 		mutex_enter(vp->v_interlock);
+	}
 	mutex_exit(&device_lock);
-	error = vget(vp, 0);
+	error = vget(vp, 0, true /* wait */);
 	if (error != 0)
 		return error;
 	*vpp = vp;
 	return 0;
+}
 /*
  * Lookup a vnode by file system mounted on and return it referenced.
  */
 int
 spec_node_lookup_by_mount(struct mount *mp, vnode_t **vpp)
+{
 @@ -334,27 +334,27 @@ spec_node_lookup_by_mount(struct mount *
 			vq = vp->v_specnode->sn_dev->sd_bdevvp;
 			if (vq != NULL &&
 			    vq->v_specnode->sn_dev->sd_mountpoint == mp)
 				break;
 			vq = NULL;
+		}
+	}
 	if (vq == NULL) {
 		mutex_exit(&device_lock);
 		return ENOENT;
+	}
 	mutex_enter(vq->v_interlock);
 	mutex_exit(&device_lock);
-	error = vget(vq, 0);
+	error = vget(vq, 0, true /* wait */);
 	if (error != 0)
 		return error;
 	*vpp = vq;
 	return 0;
+}
 /*
  * Get the file system mounted on this block device.
  */
 struct mount *
 spec_node_getmountedfs(vnode_t *devvp)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sync_subr.c,v 1.49 2014/02/25 18:30:11 pooka Exp $	*/
+/*	$NetBSD: sync_subr.c,v 1.50 2015/04/20 13:44:16 riastradh Exp $	*/
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -80,27 +80,27 @@
  * this queue:
+ *
  *	syncer_workitem_pending[syncer_delayno]
+ *
  * A delay of e.g. fifteen seconds is done by placing the request fifteen
  * entries later in the queue:
+ *
  *	syncer_workitem_pending[(syncer_delayno + 15) & syncer_mask]
+ *
  * Flag VI_ONWORKLST indicates that vnode is added into the queue.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sync_subr.c,v 1.49 2014/02/25 18:30:11 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sync_subr.c,v 1.50 2015/04/20 13:44:16 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
 #include <sys/buf.h>
 #include <sys/errno.h>
 #include <sys/kmem.h>
 @@ -229,31 +229,37 @@ sched_sync(void *arg)
 		/*
 		 * Push files whose dirty time has expired.
 		 */
 		slp = &syncer_workitem_pending[syncer_delayno];
 		syncer_delayno += 1;
 		if (syncer_delayno >= syncer_last)
 			syncer_delayno = 0;
 		while ((vp = TAILQ_FIRST(slp)) != NULL) {
 			/* We are locking in the wrong direction. */
 			synced = false;
 			if (mutex_tryenter(vp->v_interlock)) {
 				mutex_exit(&syncer_data_lock);
-				if (vget(vp, LK_EXCLUSIVE | LK_NOWAIT) == 0) {
+				if (vget(vp, LK_NOWAIT, false /* !wait */)
-					synced = true;
+				    == 0) {
-					(void) VOP_FSYNC(vp, curlwp->l_cred,
+					if (vn_lock(vp, LK_EXCLUSIVE|LK_NOWAIT)
-					    FSYNC_LAZY, 0, 0);
+					    == 0) {
-					vput(vp);
+						synced = true;
 						(void) VOP_FSYNC(vp,
 						    curlwp->l_cred, FSYNC_LAZY,
 , 0);
 						VOP_UNLOCK(vp);
+					}
 					vrele(vp);
+				}
 				mutex_enter(&syncer_data_lock);
+			}
 			/*
 			 * XXX The vnode may have been recycled, in which
 			 * case it may have a new identity.
 			 */
 			if (TAILQ_FIRST(slp) == vp) {
 				/*
 				 * Put us back on the worklist.  The worklist
 				 * routine will remove us from our current
 				 * position and then add us back in at a later

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vnode.h,v 1.251 2015/04/20 13:12:24 riastradh Exp $	*/
+/*	$NetBSD: vnode.h,v 1.252 2015/04/20 13:44:16 riastradh Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -523,27 +523,27 @@ struct vnode;
 /* see vnode(9) */
 void	vfs_vnode_sysinit(void);
 int 	bdevvp(dev_t, struct vnode **);
 int 	cdevvp(dev_t, struct vnode **);
 int 	getnewvnode(enum vtagtype, struct mount *, int (**)(void *),
 	    kmutex_t *, struct vnode **);
 void	ungetnewvnode(struct vnode *);
 int	vaccess(enum vtype, mode_t, uid_t, gid_t, mode_t, kauth_cred_t);
 void 	vattr_null(struct vattr *);
 void	vdevgone(int, int, int, enum vtype);
 int	vfinddev(dev_t, enum vtype, struct vnode **);
 int	vflush(struct mount *, struct vnode *, int);
 int	vflushbuf(struct vnode *, int);
-int 	vget(struct vnode *, int);
+int 	vget(struct vnode *, int, bool);
 void 	vgone(struct vnode *);
 int	vinvalbuf(struct vnode *, int, kauth_cred_t, struct lwp *, bool, int);
 void	vprint(const char *, struct vnode *);
 void 	vput(struct vnode *);
 bool	vrecycle(struct vnode *);
 void 	vrele(struct vnode *);
 void 	vrele_async(struct vnode *);
 void	vrele_flush(void);
 int	vtruncbuf(struct vnode *, daddr_t, bool, int);
 void	vwakeup(struct buf *);
 int	vdead_check(struct vnode *, int);
 void	vrevoke(struct vnode *);
 struct vnode *

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lfs_segment.c,v 1.237 2015/03/28 19:24:05 maxv Exp $	*/
+/*	$NetBSD: lfs_segment.c,v 1.238 2015/04/20 13:44:16 riastradh Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Konrad E. Schroder <perseant@hhhh.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -50,27 +50,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.
+ *
  *	@(#)lfs_segment.c	8.10 (Berkeley) 6/10/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.237 2015/03/28 19:24:05 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.238 2015/04/20 13:44:16 riastradh Exp $");
 #define _VFS_VNODE_PRIVATE	/* XXX: check for VI_MARKER, this has to go */
 #ifdef DEBUG
 # define vndebug(vp, str) do {						\
 	if (VTOI(vp)->i_flag & IN_CLEANING)				\
 		DLOG((DLOG_WVNODE, "not writing ino %d because %s (op %d)\n", \
 		     VTOI(vp)->i_number, (str), op));			\
 } while(0)
 #else
 # define vndebug(vp, str)
 #endif
 #define ivndebug(vp, str) \
 @@ -2771,27 +2771,27 @@ lfs_vref(struct vnode *vp)
 	ASSERT_MAYBE_SEGLOCK(fs);
 	/*
 	 * If we return 1 here during a flush, we risk vinvalbuf() not
 	 * being able to flush all of the pages from this vnode, which
 	 * will cause it to panic.  So, return 0 if a flush is in progress.
 	 */
 	if (IS_FLUSHING(VTOI(vp)->i_lfs, vp)) {
  		++fs->lfs_flushvp_fakevref;
 		mutex_exit(vp->v_interlock);
  		return 0;
+ 	}
-	return vget(vp, LK_NOWAIT);
+	return vget(vp, LK_NOWAIT, false /* !wait */);
+}
 /*
  * This is vrele except that we do not want to VOP_INACTIVE this vnode. We
  * inline vrele here to avoid the vn_lock and VOP_INACTIVE call at the end.
  */
 void
 lfs_vunref(struct vnode *vp)
+{
 	struct lfs *fs;
 	fs = VTOI(vp)->i_lfs;
 	ASSERT_MAYBE_SEGLOCK(fs);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lfs_syscalls.c,v 1.156 2015/03/28 19:24:05 maxv Exp $	*/
+/*	$NetBSD: lfs_syscalls.c,v 1.157 2015/04/20 13:44:16 riastradh Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007, 2008
  *    The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Konrad E. Schroder <perseant@hhhh.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -51,27 +51,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.
+ *
  *	@(#)lfs_syscalls.c	8.10 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_syscalls.c,v 1.156 2015/03/28 19:24:05 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_syscalls.c,v 1.157 2015/04/20 13:44:16 riastradh Exp $");
 #ifndef LFS
 # define LFS		/* for prototypes in syscallargs.h */
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/kernel.h>
 #include <sys/kauth.h>
 @@ -704,27 +704,28 @@ lfs_bmapv(struct proc *p, fsid_t *fsidp,
 		 * Get the IFILE entry (only once) and see if the file still
 		 * exists.
 		 */
 		if (lastino != blkp->bi_inode) {
 			/*
 			 * Finish the old file, if there was one.  The presence
 			 * of a usable vnode in vp is signaled by a valid
 			 * v_daddr.
 			 */
 			if (v_daddr != LFS_UNUSED_DADDR) {
 				lfs_vunref(vp);
 				if (VTOI(vp)->i_lfs_iflags & LFSI_BMAP) {
 					mutex_enter(vp->v_interlock);
-					if (vget(vp, LK_NOWAIT) == 0) {
+					if (vget(vp, LK_NOWAIT,
 						false /* !wait */) == 0) {
 						if (! vrecycle(vp))
 							vrele(vp);
+					}
+				}
 				numrefed--;
+			}
 			/*
 			 * Start a new file
 			 */
 			lastino = blkp->bi_inode;
 			if (blkp->bi_inode == LFS_IFILE_INUM)
 				v_daddr = fs->lfs_idaddr;
 @@ -822,27 +823,27 @@ lfs_bmapv(struct proc *p, fsid_t *fsidp,
 				blkp->bi_size = fs->lfs_bsize;
+		}
+	}
 	/*
 	 * Finish the old file, if there was one.  The presence
 	 * of a usable vnode in vp is signaled by a valid v_daddr.
 	 */
 	if (v_daddr != LFS_UNUSED_DADDR) {
 		lfs_vunref(vp);
 		/* Recycle as above. */
 		if (ip->i_lfs_iflags & LFSI_BMAP) {
 			mutex_enter(vp->v_interlock);
-			if (vget(vp, LK_NOWAIT) == 0) {
+			if (vget(vp, LK_NOWAIT, false /* !wait */) == 0) {
 				if (! vrecycle(vp))
 					vrele(vp);
+			}
+		}
 		numrefed--;
+	}
 #ifdef DIAGNOSTIC
 	if (numrefed != 0)
 		panic("lfs_bmapv: numrefed=%d", numrefed);
 #endif
 	vfs_unbusy(mntp, false, NULL);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ulfs_ihash.c,v 1.4 2014/02/27 16:51:39 hannken Exp $	*/
+/*	$NetBSD: ulfs_ihash.c,v 1.5 2015/04/20 13:44:16 riastradh Exp $	*/
 /*  from NetBSD: ufs_ihash.c,v 1.31 2011/06/12 03:36:02 rmind Exp  */
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -23,27 +23,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.
+ *
  *	@(#)ufs_ihash.c	8.7 (Berkeley) 5/17/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_ihash.c,v 1.4 2014/02/27 16:51:39 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_ihash.c,v 1.5 2015/04/20 13:44:16 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <ufs/lfs/ulfs_inode.h>
 #include <ufs/lfs/ulfs_extern.h>
 /*
  * Structures associated with inode cacheing.
  */
 @@ -130,39 +130,47 @@ ulfs_ihashlookup(dev_t dev, ino_t inum)
+}
 /*
  * Use the device/inum pair to find the incore inode, and return a pointer
  * to it. If it is in core, but locked, wait for it.
  */
 struct vnode *
 ulfs_ihashget(dev_t dev, ino_t inum, int flags)
+{
 	struct ihashhead *ipp;
 	struct inode *ip;
 	struct vnode *vp;
 	KASSERT(flags == (flags & LK_EXCLUSIVE));
  loop:
 	mutex_enter(&ulfs_ihash_lock);
 	ipp = &ihashtbl[INOHASH(dev, inum)];
 	LIST_FOREACH(ip, ipp, i_hash) {
 		if (inum == ip->i_number && dev == ip->i_dev) {
 			vp = ITOV(ip);
 			if (flags == 0) {
 				mutex_exit(&ulfs_ihash_lock);
 			} else {
 				mutex_enter(vp->v_interlock);
 				mutex_exit(&ulfs_ihash_lock);
-				if (vget(vp, flags))
+				if (vget(vp, 0, true /* wait */) != 0)
 					goto loop;
 				if (flags & LK_EXCLUSIVE) {
 					if (vn_lock(vp, LK_EXCLUSIVE) != 0) {
 						vrele(vp);
 						goto loop;
+					}
+				}
+			}
 			return (vp);
+		}
+	}
 	mutex_exit(&ulfs_ihash_lock);
 	return (NULL);
+}
 /*
  * Insert the inode into the hash table, and return it locked.
  */
 void
 ulfs_ihashins(struct inode *ip)