From owner-svn-src-all@FreeBSD.ORG  Tue Dec 23 20:04:32 2008
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 3E8101065674;
	Tue, 23 Dec 2008 20:04:32 +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 2BC128FC1A;
	Tue, 23 Dec 2008 20:04:32 +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 mBNK4VbV012219;
	Tue, 23 Dec 2008 20:04:31 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBNK4VPP012218;
	Tue, 23 Dec 2008 20:04:31 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200812232004.mBNK4VPP012218@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Tue, 23 Dec 2008 20:04:31 +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: r186455 - head/sys/kern
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, 23 Dec 2008 20:04:32 -0000

Author: kib
Date: Tue Dec 23 20:04:31 2008
New Revision: 186455
URL: http://svn.freebsd.org/changeset/base/186455

Log:
  Keep the hold on the vnode during VOP_VPTOCNP() call, allowing the vop
  implementation to drop vnode lock, if needed.
  
  Reported and tested by:	pho

Modified:
  head/sys/kern/vfs_cache.c

Modified: head/sys/kern/vfs_cache.c
==============================================================================
--- head/sys/kern/vfs_cache.c	Tue Dec 23 19:59:21 2008	(r186454)
+++ head/sys/kern/vfs_cache.c	Tue Dec 23 20:04:31 2008	(r186455)
@@ -851,9 +851,9 @@ vn_vptocnp(struct vnode **vp, char **bp,
 	CACHE_UNLOCK();
 	vfslocked = VFS_LOCK_GIANT((*vp)->v_mount);
 	vn_lock(*vp, LK_SHARED | LK_RETRY);
-	vdrop(*vp);
 	error = VOP_VPTOCNP(*vp, &dvp, buf, buflen);
 	VOP_UNLOCK(*vp, 0);
+	vdrop(*vp);
 	VFS_UNLOCK_GIANT(vfslocked);
 	if (error) {
 		numfullpathfail2++;