Module Name: src
Committed By: eeh
Date: Tue Nov 17 22:49:24 UTC 2009
Modified Files:
src/sys/ufs/lfs: lfs_vnops.c
Log Message:
This should fix a deadlock.
To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/sys/ufs/lfs/lfs_vnops.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_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.224 src/sys/ufs/lfs/lfs_vnops.c:1.225
--- src/sys/ufs/lfs/lfs_vnops.c:1.224 Thu Nov 5 11:54:49 2009
+++ src/sys/ufs/lfs/lfs_vnops.c Tue Nov 17 22:49:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.224 2009/11/05 11:54:49 pooka Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.225 2009/11/17 22:49:24 eeh 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_vnops.c,v 1.224 2009/11/05 11:54:49 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.225 2009/11/17 22:49:24 eeh Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -2286,8 +2286,10 @@
mutex_enter(&vp->v_interlock);
write_and_wait(fs, vp, busypg, seglocked, NULL);
if (!seglocked) {
+ mutex_exit(&vp->v_interlock);
lfs_release_finfo(fs);
lfs_segunlock(fs);
+ mutex_enter(&vp->v_interlock);
}
sp->vp = NULL;
goto get_seglock;
