Module Name: src
Committed By: hannken
Date: Fri Jun 25 10:03:52 UTC 2010
Modified Files:
src/sys/ufs/lfs: lfs_subr.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/ufs/lfs/lfs_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/lfs_subr.c
diff -u src/sys/ufs/lfs/lfs_subr.c:1.75 src/sys/ufs/lfs/lfs_subr.c:1.76
--- src/sys/ufs/lfs/lfs_subr.c:1.75 Thu Jun 24 07:54:47 2010
+++ src/sys/ufs/lfs/lfs_subr.c Fri Jun 25 10:03:52 2010
@@ -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;
}
