From owner-svn-src-head@FreeBSD.ORG  Thu Apr  2 21:16:21 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 268791065705;
	Thu,  2 Apr 2009 21:16:21 +0000 (UTC)
	(envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 14E018FC0A;
	Thu,  2 Apr 2009 21:16:21 +0000 (UTC)
	(envelope-from peter@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 n32LGK8j076211;
	Thu, 2 Apr 2009 21:16:20 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n32LGK81076210;
	Thu, 2 Apr 2009 21:16:20 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <200904022116.n32LGK81076210@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Thu, 2 Apr 2009 21:16:20 +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: r190655 - head/sys/kern
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: Thu, 02 Apr 2009 21:16:21 -0000

Author: peter
Date: Thu Apr  2 21:16:20 2009
New Revision: 190655
URL: http://svn.freebsd.org/changeset/base/190655

Log:
  vn_vptocnp() unlocks the name cache and forgets to re-lock it before
  returning in one error case, and mistakenly unlocks it for the
  umount -f case.

Modified:
  head/sys/kern/vfs_cache.c

Modified: head/sys/kern/vfs_cache.c
==============================================================================
--- head/sys/kern/vfs_cache.c	Thu Apr  2 19:27:56 2009	(r190654)
+++ head/sys/kern/vfs_cache.c	Thu Apr  2 21:16:20 2009	(r190655)
@@ -971,6 +971,7 @@ vn_vptocnp(struct vnode **vp, char **bp,
 	vdrop(*vp);
 	VFS_UNLOCK_GIANT(vfslocked);
 	if (error) {
+		CACHE_RLOCK();
 		numfullpathfail2++;
 		return (error);
 	}
@@ -979,7 +980,6 @@ vn_vptocnp(struct vnode **vp, char **bp,
 	CACHE_RLOCK();
 	if ((*vp)->v_iflag & VI_DOOMED) {
 		/* forced unmount */
-		CACHE_RUNLOCK();
 		vdrop(*vp);
 		return (ENOENT);
 	}