From owner-svn-src-stable-9@FreeBSD.ORG  Sat Nov 24 12:56:08 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 4F1E786E;
 Sat, 24 Nov 2012 12:56:08 +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 33C808FC12;
 Sat, 24 Nov 2012 12:56:08 +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 qAOCu85r054593;
 Sat, 24 Nov 2012 12:56:08 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAOCu8lN054592;
 Sat, 24 Nov 2012 12:56:08 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201211241256.qAOCu8lN054592@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 24 Nov 2012 12:56:08 +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: r243491 - 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:56:08 -0000

Author: avg
Date: Sat Nov 24 12:56:07 2012
New Revision: 243491
URL: http://svnweb.freebsd.org/changeset/base/243491

Log:
  MFC r242572: opensolaris compat: clear VI_MOUNT before returning if
  mount_snapshot fails

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

Modified: stable/9/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
==============================================================================
--- stable/9/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c	Sat Nov 24 12:53:38 2012	(r243490)
+++ stable/9/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c	Sat Nov 24 12:56:07 2012	(r243491)
@@ -191,6 +191,9 @@ mount_snapshot(kthread_t *td, vnode_t **
 	td->td_ucred = cr;
 
 	if (error != 0) {
+		VI_LOCK(vp);
+		vp->v_iflag &= ~VI_MOUNT;
+		VI_UNLOCK(vp);
 		vrele(vp);
 		vfs_unbusy(mp);
 		vfs_mount_destroy(mp);