From owner-svn-src-all@FreeBSD.ORG  Tue Sep 20 21:53:27 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5D39A1065673;
	Tue, 20 Sep 2011 21:53:27 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4DA028FC14;
	Tue, 20 Sep 2011 21:53:27 +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 p8KLrRZI046139;
	Tue, 20 Sep 2011 21:53:27 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8KLrRK3046137;
	Tue, 20 Sep 2011 21:53:27 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201109202153.p8KLrRK3046137@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Tue, 20 Sep 2011 21:53:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225700 - head/sys/ufs/ffs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Sep 2011 21:53:27 -0000

Author: kib
Date: Tue Sep 20 21:53:26 2011
New Revision: 225700
URL: http://svn.freebsd.org/changeset/base/225700

Log:
  Use nowait sync request for a vnode when doing softdep cleanup. We possibly
  own the unrelated vnode lock, doing waiting sync causes deadlocks.
  
  Reported and tested by:	pho
  Approved by:	re (bz)

Modified:
  head/sys/ufs/ffs/ffs_softdep.c

Modified: head/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- head/sys/ufs/ffs/ffs_softdep.c	Tue Sep 20 21:49:54 2011	(r225699)
+++ head/sys/ufs/ffs/ffs_softdep.c	Tue Sep 20 21:53:26 2011	(r225700)
@@ -12648,7 +12648,7 @@ retry:
 				MNT_ILOCK(mp);
 				continue;
 			}
-			(void) ffs_syncvnode(lvp, MNT_WAIT);
+			(void) ffs_syncvnode(lvp, MNT_NOWAIT);
 			vput(lvp);
 			MNT_ILOCK(mp);
 		}