From owner-svn-src-user@FreeBSD.ORG  Mon Aug  6 15:22:12 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E2B9E106566C;
	Mon,  6 Aug 2012 15:22:12 +0000 (UTC)
	(envelope-from jceel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CDDD18FC17;
	Mon,  6 Aug 2012 15:22:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q76FMClg052370;
	Mon, 6 Aug 2012 15:22:12 GMT (envelope-from jceel@svn.freebsd.org)
Received: (from jceel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q76FMC7n052368;
	Mon, 6 Aug 2012 15:22:12 GMT (envelope-from jceel@svn.freebsd.org)
Message-Id: <201208061522.q76FMC7n052368@svn.freebsd.org>
From: Jakub Wojciech Klama <jceel@FreeBSD.org>
Date: Mon, 6 Aug 2012 15:22:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239094 - user/jceel/soc2012_armv6/sys/nfsclient
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Aug 2012 15:22:13 -0000

Author: jceel
Date: Mon Aug  6 15:22:11 2012
New Revision: 239094
URL: http://svn.freebsd.org/changeset/base/239094

Log:
  Fix mutex recursion in NFS client by removing
  MNT_ILOCK and MNT_INUNLOCK in nfs_sync().

Modified:
  user/jceel/soc2012_armv6/sys/nfsclient/nfs_vfsops.c

Modified: user/jceel/soc2012_armv6/sys/nfsclient/nfs_vfsops.c
==============================================================================
--- user/jceel/soc2012_armv6/sys/nfsclient/nfs_vfsops.c	Mon Aug  6 11:02:23 2012	(r239093)
+++ user/jceel/soc2012_armv6/sys/nfsclient/nfs_vfsops.c	Mon Aug  6 15:22:11 2012	(r239094)
@@ -1442,14 +1442,18 @@ nfs_sync(struct mount *mp, int waitfor)
 
 	td = curthread;
 
+#if 0
 	MNT_ILOCK(mp);
+#endif
 	/*
 	 * If a forced dismount is in progress, return from here so that
 	 * the umount(2) syscall doesn't get stuck in VFS_SYNC() before
 	 * calling VFS_UNMOUNT().
 	 */
 	if ((mp->mnt_kern_flag & MNTK_UNMOUNTF) != 0) {
+#if 0
 		MNT_IUNLOCK(mp);
+#endif
 		return (EBADF);
 	}