CVS commit: [netbsd-7] src/sys/ufs/lfs

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Thu Jul 14 18:45:39 UTC 2016

Modified Files:
        src/sys/ufs/lfs [netbsd-7]: lfs_vnops.c

Log Message:
Pull up following revision(s) (requested by dholland in ticket #1205):
        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.269.2.1 -r1.269.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.269.2.1 src/sys/ufs/lfs/lfs_vnops.c:1.269.2.2
--- src/sys/ufs/lfs/lfs_vnops.c:1.269.2.1	Thu Aug  6 21:57:28 2015
+++ src/sys/ufs/lfs/lfs_vnops.c	Thu Jul 14 18:45:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_vnops.c,v 1.269.2.1 2015/08/06 21:57:28 snj Exp $	*/
+/*	$NetBSD: lfs_vnops.c,v 1.269.2.2 2016/07/14 18:45:39 martin 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.269.2.1 2015/08/06 21:57:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.269.2.2 2016/07/14 18:45:39 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -527,8 +527,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;
 	}