From owner-svn-src-stable-7@FreeBSD.ORG  Fri Jun 19 18:18:10 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2696E1065673;
	Fri, 19 Jun 2009 18:18:10 +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 147718FC0A;
	Fri, 19 Jun 2009 18:18:10 +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 n5JII9sC051703;
	Fri, 19 Jun 2009 18:18:09 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5JII9IT051701;
	Fri, 19 Jun 2009 18:18:09 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200906191818.n5JII9IT051701@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 19 Jun 2009 18:18:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194502 - in stable/7/sys: . contrib/pf fs/cd9660
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Jun 2009 18:18:10 -0000

Author: jhb
Date: Fri Jun 19 18:18:09 2009
New Revision: 194502
URL: http://svn.freebsd.org/changeset/base/194502

Log:
  MFC: Update the inline version of vn_vget_ino() for ".." lookups to match
  the recentish changes to vn_vget_ino().

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/fs/cd9660/cd9660_lookup.c

Modified: stable/7/sys/fs/cd9660/cd9660_lookup.c
==============================================================================
--- stable/7/sys/fs/cd9660/cd9660_lookup.c	Fri Jun 19 17:59:29 2009	(r194501)
+++ stable/7/sys/fs/cd9660/cd9660_lookup.c	Fri Jun 19 18:18:09 2009	(r194502)
@@ -375,15 +375,17 @@ found:
 		 */
 		mp = pdp->v_mount;
 		ltype = VOP_ISLOCKED(pdp, td);
-		for (;;) {
-			error = vfs_busy(mp, LK_NOWAIT, NULL, curthread);
-			if (error == 0)
-				break;
+		error = vfs_busy(mp, LK_NOWAIT, NULL, td);
+		if (error != 0) {
 			VOP_UNLOCK(pdp, 0, td);
-			pause("vn_vget", 1);
+			error = vfs_busy(mp, 0, NULL, td);
 			vn_lock(pdp, ltype | LK_RETRY, td);
-			if (pdp->v_iflag & VI_DOOMED)
+			if (error)
+				return (ENOENT);
+			if (pdp->v_iflag & VI_DOOMED) {
+				vfs_unbusy(mp, td);
 				return (ENOENT);
+			}
 		}
 		VOP_UNLOCK(pdp, 0, td);
 		error = cd9660_vget_internal(vdp->v_mount, i_ino,