From owner-svn-src-stable-9@FreeBSD.ORG  Sat Nov 24 12:42:29 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 84E9B905;
 Sat, 24 Nov 2012 12:42:29 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6A0858FC14;
 Sat, 24 Nov 2012 12:42:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAOCgTWW052325;
 Sat, 24 Nov 2012 12:42:29 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAOCgTps052324;
 Sat, 24 Nov 2012 12:42:29 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201211241242.qAOCgTps052324@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 24 Nov 2012 12:42:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243484 - stable/9/sys/cddl/compat/opensolaris/kern
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Nov 2012 12:42:29 -0000

Author: avg
Date: Sat Nov 24 12:42:29 2012
New Revision: 243484
URL: http://svnweb.freebsd.org/changeset/base/243484

Log:
  MFC r242569: opensolaris_lookup: use vfs_busy in traverse before calling VFS_ROOT

Modified:
  stable/9/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c
==============================================================================
--- stable/9/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c	Sat Nov 24 12:40:43 2012	(r243483)
+++ stable/9/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c	Sat Nov 24 12:42:29 2012	(r243484)
@@ -88,6 +88,7 @@ traverse(vnode_t **cvpp, int lktype)
 		vfsp = vn_mountedvfs(cvp);
 		if (vfsp == NULL)
 			break;
+		error = vfs_busy(vfsp, 0);
 		/*
 		 * tvp is NULL for *cvpp vnode, which we can't unlock.
 		 */
@@ -95,12 +96,15 @@ traverse(vnode_t **cvpp, int lktype)
 			vput(cvp);
 		else
 			vrele(cvp);
+		if (error)
+			return (error);
 
 		/*
 		 * The read lock must be held across the call to VFS_ROOT() to
 		 * prevent a concurrent unmount from destroying the vfs.
 		 */
 		error = VFS_ROOT(vfsp, lktype, &tvp);
+		vfs_unbusy(vfsp);
 		if (error != 0)
 			return (error);
 		cvp = tvp;