From owner-svn-src-all@FreeBSD.ORG  Fri Jun 12 21:19:57 2009
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 6BE83106566B;
	Fri, 12 Jun 2009 21:19:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A3FD8FC08;
	Fri, 12 Jun 2009 21:19:57 +0000 (UTC) (envelope-from jhb@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 n5CLJvvO093222;
	Fri, 12 Jun 2009 21:19:57 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5CLJvDt093221;
	Fri, 12 Jun 2009 21:19:57 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200906122119.n5CLJvDt093221@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 12 Jun 2009 21:19:57 +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: r194078 - head/sys/fs/cd9660
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: Fri, 12 Jun 2009 21:19:57 -0000

Author: jhb
Date: Fri Jun 12 21:19:57 2009
New Revision: 194078
URL: http://svn.freebsd.org/changeset/base/194078

Log:
  Update the inline version of vn_get_ino() for ".." lookups to match the
  recentish changes to vn_get_ino().
  
  MFC after:	1 week

Modified:
  head/sys/fs/cd9660/cd9660_lookup.c

Modified: head/sys/fs/cd9660/cd9660_lookup.c
==============================================================================
--- head/sys/fs/cd9660/cd9660_lookup.c	Fri Jun 12 20:50:28 2009	(r194077)
+++ head/sys/fs/cd9660/cd9660_lookup.c	Fri Jun 12 21:19:57 2009	(r194078)
@@ -374,15 +374,17 @@ found:
 		 */
 		mp = pdp->v_mount;
 		ltype = VOP_ISLOCKED(pdp);
-		for (;;) {
-			error = vfs_busy(mp, MBF_NOWAIT);
-			if (error == 0)
-				break;
+		error = vfs_busy(mp, MBF_NOWAIT);
+		if (error != 0) {
 			VOP_UNLOCK(pdp, 0);
-			pause("vn_vget", 1);
+			error = vfs_busy(mp, 0);
 			vn_lock(pdp, ltype | LK_RETRY);
-			if (pdp->v_iflag & VI_DOOMED)
+			if (error)
+				return (ENOENT);
+			if (pdp->v_iflag & VI_DOOMED) {
+				vfs_unbusy(mp);
 				return (ENOENT);
+			}
 		}
 		VOP_UNLOCK(pdp, 0);
 		error = cd9660_vget_internal(vdp->v_mount, i_ino,