[src/trunk]: src/sys/ufs/lfs Undo last commit and don't try to lock vnodes in...

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/24d80b7ea2a7
branches:  trunk
changeset: 755853:24d80b7ea2a7
user:      hannken <hannken%NetBSD.org@localhost>
date:      Fri Jun 25 10:03:52 2010 +0000

description:
Undo last commit and don't try to lock vnodes in lfs_unmark_dirop()
as we may deadlock trying to write the superblock.

Should fix PR #43503 Can't create device nodes on LFS.

diffstat:

 sys/ufs/lfs/lfs_subr.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 63da7c84d7a3 -r 24d80b7ea2a7 sys/ufs/lfs/lfs_subr.c
--- a/sys/ufs/lfs/lfs_subr.c    Fri Jun 25 07:40:35 2010 +0000
+++ b/sys/ufs/lfs/lfs_subr.c    Fri Jun 25 10:03:52 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_subr.c,v 1.75 2010/06/24 07:54:47 hannken Exp $    */
+/*     $NetBSD: lfs_subr.c,v 1.76 2010/06/25 10:03:52 hannken Exp $    */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_subr.c,v 1.75 2010/06/24 07:54:47 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_subr.c,v 1.76 2010/06/25 10:03:52 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -362,8 +362,6 @@
                nip = TAILQ_NEXT(ip, i_lfs_dchain);
                vp = ITOV(ip);
                if ((VTOI(vp)->i_flag & (IN_ADIROP | IN_ALLMOD)) == 0) {
-                       if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_RETRY))
-                               continue;
                        --lfs_dirvcount;
                        --fs->lfs_dirvcount;
                        vp->v_uflag &= ~VU_DIROP;
@@ -371,7 +369,7 @@
                        wakeup(&lfs_dirvcount);
                        fs->lfs_unlockvp = vp;
                        mutex_exit(&lfs_lock);
-                       vput(vp);
+                       vrele(vp);
                        mutex_enter(&lfs_lock);
                        fs->lfs_unlockvp = NULL;
                }