From owner-svn-src-head@FreeBSD.ORG  Fri Jan  9 22:06:48 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 B29E3106568F;
	Fri,  9 Jan 2009 22:06:48 +0000 (UTC)
	(envelope-from marcus@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A1B668FC0C;
	Fri,  9 Jan 2009 22:06:48 +0000 (UTC)
	(envelope-from marcus@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 n09M6mEY070420;
	Fri, 9 Jan 2009 22:06:48 GMT (envelope-from marcus@svn.freebsd.org)
Received: (from marcus@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n09M6mun070419;
	Fri, 9 Jan 2009 22:06:48 GMT (envelope-from marcus@svn.freebsd.org)
Message-Id: <200901092206.n09M6mun070419@svn.freebsd.org>
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Fri, 9 Jan 2009 22:06:48 +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: r186981 - head/sys/fs/pseudofs
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: Fri, 09 Jan 2009 22:06:49 -0000

Author: marcus (doc,ports committer)
Date: Fri Jan  9 22:06:48 2009
New Revision: 186981
URL: http://svn.freebsd.org/changeset/base/186981

Log:
  Fix a deadlock which can occur due to a pseudofs vnode not getting unlocked.
  
  Reported by:	Richard Todd <rmtodd@ichotolot.servalan.com>
  Reviewed by:	kib
  Approved by:	kib

Modified:
  head/sys/fs/pseudofs/pseudofs_vncache.c

Modified: head/sys/fs/pseudofs/pseudofs_vncache.c
==============================================================================
--- head/sys/fs/pseudofs/pseudofs_vncache.c	Fri Jan  9 21:57:49 2009	(r186980)
+++ head/sys/fs/pseudofs/pseudofs_vncache.c	Fri Jan  9 22:06:48 2009	(r186981)
@@ -212,6 +212,7 @@ retry2:
 			if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, curthread) == 0) {
 				++pfs_vncache_hits;
 				vgone(*vpp);
+				vput(*vpp);
 				*vpp = vp;
 				cache_purge(vp);
 				return (0);