Module Name: src
Committed By: maya
Date: Wed Jul 13 16:26:26 UTC 2016
Modified Files:
src/sys/ufs/lfs: lfs_vnops.c
Log Message:
Fix a deadlock
ok dholland@
To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 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.303 src/sys/ufs/lfs/lfs_vnops.c:1.304
--- src/sys/ufs/lfs/lfs_vnops.c:1.303 Mon Jun 20 03:55:34 2016
+++ src/sys/ufs/lfs/lfs_vnops.c Wed Jul 13 16:26:26 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.303 2016/06/20 03:55:34 dholland Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.304 2016/07/13 16:26:26 maya Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.303 2016/06/20 03:55:34 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.304 2016/07/13 16:26:26 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -593,8 +593,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;
}
