Module Name: src
Committed By: bouyer
Date: Sat Aug 27 14:13:18 UTC 2016
Modified Files:
src/sys/ufs/lfs [netbsd-6]: lfs_vnops.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1389):
sys/ufs/lfs/lfs_vnops.c: revision 1.304
Fix a deadlock
ok dholland@
To generate a diff of this commit:
cvs rdiff -u -r1.239.2.1 -r1.239.2.2 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.239.2.1 src/sys/ufs/lfs/lfs_vnops.c:1.239.2.2
--- src/sys/ufs/lfs/lfs_vnops.c:1.239.2.1 Sat Mar 17 17:40:06 2012
+++ src/sys/ufs/lfs/lfs_vnops.c Sat Aug 27 14:13:18 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.239.2.1 2012/03/17 17:40:06 bouyer Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.239.2.2 2016/08/27 14:13:18 bouyer 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.239.2.1 2012/03/17 17:40:06 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.239.2.2 2016/08/27 14:13:18 bouyer Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -443,8 +443,10 @@ lfs_set_dirop(struct vnode *dvp, struct
if ((error = mtsleep(&lfs_dirvcount,
PCATCH | PUSER | PNORELOCK, "lfs_maxdirop", 0,
&lfs_lock)) != 0) {
+ mutex_exit(&lfs_lock);
goto unreserve;
}
+ mutex_exit(&lfs_lock);
goto restart;
}
