From owner-svn-src-head@FreeBSD.ORG  Tue Jun 30 10:07:01 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1CDA0106566C;
	Tue, 30 Jun 2009 10:07:01 +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 0A8FE8FC0A;
	Tue, 30 Jun 2009 10:07:01 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5UA70XU074856;
	Tue, 30 Jun 2009 10:07:00 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5UA70KO074854;
	Tue, 30 Jun 2009 10:07:00 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200906301007.n5UA70KO074854@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Tue, 30 Jun 2009 10:07:00 +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: r195186 - head/sys/ufs/ffs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Jun 2009 10:07:01 -0000

Author: kib
Date: Tue Jun 30 10:07:00 2009
New Revision: 195186
URL: http://svn.freebsd.org/changeset/base/195186

Log:
  Softdep_fsync() may need to lock parent directory of the synced vnode.
  Use inlined (due to FFSV_FORCEINSMQ) version of vn_vget_ino() to prevent
  mountpoint from being unmounted and freed while no vnodes are locked.
  
  Tested by:	pho
  Approved by:	re (kensmith)
  MFC after:	1 month

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

Modified: head/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- head/sys/ufs/ffs/ffs_softdep.c	Tue Jun 30 09:51:41 2009	(r195185)
+++ head/sys/ufs/ffs/ffs_softdep.c	Tue Jun 30 10:07:00 2009	(r195186)
@@ -5102,10 +5102,28 @@ softdep_fsync(vp)
 		FREE_LOCK(&lk);
 		if (ffs_vgetf(mp, parentino, LK_NOWAIT | LK_EXCLUSIVE, &pvp,
 		    FFSV_FORCEINSMQ)) {
+			error = vfs_busy(mp, MBF_NOWAIT);
+			if (error != 0) {
+				VOP_UNLOCK(vp, 0);
+				error = vfs_busy(mp, 0);
+				vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+				if (error != 0)
+					return (ENOENT);
+				if (vp->v_iflag & VI_DOOMED) {
+					vfs_unbusy(mp);
+					return (ENOENT);
+				}
+			}
 			VOP_UNLOCK(vp, 0);
 			error = ffs_vgetf(mp, parentino, LK_EXCLUSIVE,
 			    &pvp, FFSV_FORCEINSMQ);
+			vfs_unbusy(mp);
 			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+			if (vp->v_iflag & VI_DOOMED) {
+				if (error == 0)
+					vput(pvp);
+				error = ENOENT;
+			}
 			if (error != 0)
 				return (error);
 		}