From owner-svn-src-head@FreeBSD.ORG  Sun Nov  4 14:27:32 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2A6EBEBC;
 Sun,  4 Nov 2012 14:27:32 +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 1238B8FC16;
 Sun,  4 Nov 2012 14:27:32 +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 qA4ERVnG007726;
 Sun, 4 Nov 2012 14:27:31 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA4ERVA5007724;
 Sun, 4 Nov 2012 14:27:31 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201211041427.qA4ERVA5007724@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 4 Nov 2012 14:27:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242572 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Nov 2012 14:27:32 -0000

Author: avg
Date: Sun Nov  4 14:27:31 2012
New Revision: 242572
URL: http://svn.freebsd.org/changeset/base/242572

Log:
  opensolaris compat: clear VI_MOUNT before returning if mount_snapshot fails
  
  To do: investigate if it would be possible to use normal vfs_domount here.
  
  Reviewed by:	kib
  MFC after:	19 days

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

Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
==============================================================================
--- head/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c	Sun Nov  4 14:24:00 2012	(r242571)
+++ head/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c	Sun Nov  4 14:27:31 2012	(r242572)
@@ -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);