From owner-svn-src-all@FreeBSD.ORG  Sun Nov  4 14:16:19 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 591717C9;
 Sun,  4 Nov 2012 14:16:19 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 3FCBE8FC08;
 Sun,  4 Nov 2012 14:16:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA4EGJYS005731;
 Sun, 4 Nov 2012 14:16:19 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4EGJWf005729;
 Sun, 4 Nov 2012 14:16:19 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201211041416.qA4EGJWf005729@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 4 Nov 2012 14:16:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242569 - head/sys/cddl/compat/opensolaris/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sun, 04 Nov 2012 14:16:19 -0000

Author: avg
Date: Sun Nov  4 14:16:18 2012
New Revision: 242569
URL: http://svn.freebsd.org/changeset/base/242569

Log:
  opensolaris_lookup: use vfs_busy in traverse before calling VFS_ROOT
  
  ... to ensure that we have a valid mountpoint during the call.
  
  Reviewed by:	kib
  MFC after:	19 days

Modified:
  head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c

Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c
==============================================================================
--- head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c	Sun Nov  4 14:15:13 2012	(r242568)
+++ head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c	Sun Nov  4 14:16:18 2012	(r242569)
@@ -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;