 @@ -1,14 +1,14 @@
-/*	$NetBSD: lfs_vnops.c,v 1.276 2015/07/25 10:40:35 martin Exp $	*/
+/*	$NetBSD: lfs_vnops.c,v 1.277 2015/07/26 08:13:23 hannken 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.
 @@ -115,27 +115,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_vnops.c	8.28 (Berkeley) 7/31/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.276 2015/07/25 10:40:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.277 2015/07/26 08:13:23 hannken Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
 #include "opt_uvm_page_trkown.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 @@ -1672,51 +1672,54 @@ lfs_flush_pchain(struct lfs *fs)
 	lfs_imtime(fs);
 	lfs_seglock(fs, 0);
 	sp = fs->lfs_sp;
 	/*
 	 * lfs_writevnodes, optimized to clear pageout requests.
 	 * Only write non-dirop files that are in the pageout queue.
 	 * We're very conservative about what we write; we want to be
 	 * fast and async.
 	 */
 	mutex_enter(&lfs_lock);
     top:
 	for (ip = TAILQ_FIRST(&fs->lfs_pchainhd); ip != NULL; ip = nip) {
 		struct mount *mp = ITOV(ip)->v_mount;
 		ino_t ino = ip->i_number;
 		nip = TAILQ_NEXT(ip, i_lfs_pchain);
 		vp = ITOV(ip);
 		if (!(ip->i_flags & IN_PAGING))
 			goto top;
 		mutex_enter(vp->v_interlock);
 		if (vdead_check(vp, VDEAD_NOWAIT) != 0 ||
 		    (vp->v_uflag & VU_DIROP) != 0) {
 			mutex_exit(vp->v_interlock);
 			continue;
 		if (vp->v_type != VREG) {
 			mutex_exit(vp->v_interlock);
 			continue;
 		if (vget(vp, LK_NOWAIT, false /* !wait */))
 			continue;
 		mutex_exit(&lfs_lock);
 		if (vcache_get(mp, &ino, sizeof(ino), &vp) != 0) {
-		if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_RETRY) != 0) {
+			mutex_enter(&lfs_lock);
 			continue;
 		};
 		if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT) != 0) {
 			vrele(vp);
 			mutex_enter(&lfs_lock);
 			continue;
+		}
 		ip = VTOI(vp);
 		mutex_enter(&lfs_lock);
 		if ((vp->v_uflag & VU_DIROP) != 0 || vp->v_type != VREG ||
 		    !(ip->i_flags & IN_PAGING)) {
 			mutex_exit(&lfs_lock);
 			vput(vp);
 			mutex_enter(&lfs_lock);
 			goto top;
+		}
 		mutex_exit(&lfs_lock);
 		error = lfs_writefile(fs, sp, vp);
 		if (!VPISEMPTY(vp) && !WRITEINPROG(vp) &&
 		    !(ip->i_flag & IN_ALLMOD)) {
 		    	mutex_enter(&lfs_lock);
 			LFS_SET_UINO(ip, IN_MODIFIED);
 		    	mutex_exit(&lfs_lock);
+		}
 		KDASSERT(ip->i_number != LFS_IFILE_INUM);
 		error2 = lfs_writeinode(fs, sp, ip);
 		VOP_UNLOCK(vp);
 		vrele(vp);