[src/netbsd-7]: src/sys/ufs/lfs Pull up following revision(s) (requested by d...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3e85c647ce52
branches:  netbsd-7
changeset: 799944:3e85c647ce52
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jul 14 18:45:39 2016 +0000

description:
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@

diffstat:

 sys/ufs/lfs/lfs_vnops.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r ce7a081ec3d7 -r 3e85c647ce52 sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c   Thu Jul 14 18:38:51 2016 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c   Thu Jul 14 18:45:39 2016 +0000
@@ -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 @@
                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;
        }