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

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

details:   https://anonhg.NetBSD.org/src/rev/2c469b99b472
branches:  netbsd-6
changeset: 777090:2c469b99b472
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Aug 27 14:13:18 2016 +0000

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

diffstat:

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

diffs (29 lines):

diff -r 9625fa609890 -r 2c469b99b472 sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c   Sat Aug 27 14:11:02 2016 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c   Sat Aug 27 14:13:18 2016 +0000
@@ -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 @@
                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;
        }