From owner-svn-src-projects@FreeBSD.ORG  Tue Mar 19 22:27:17 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 68D679C5;
 Tue, 19 Mar 2013 22:27:17 +0000 (UTC) (envelope-from mm@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 5A776A81;
 Tue, 19 Mar 2013 22:27:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2JMRGgL067703;
 Tue, 19 Mar 2013 22:27:16 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2JMRGr0067702;
 Tue, 19 Mar 2013 22:27:16 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201303192227.r2JMRGr0067702@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Tue, 19 Mar 2013 22:27:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r248538 -
 projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Mar 2013 22:27:17 -0000

Author: mm
Date: Tue Mar 19 22:27:15 2013
New Revision: 248538
URL: http://svnweb.freebsd.org/changeset/base/248538

Log:
  Run zvol_create_minors() only if in non-error case

Modified:
  projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c

Modified: projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
==============================================================================
--- projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	Tue Mar 19 22:14:50 2013	(r248537)
+++ projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c	Tue Mar 19 22:27:15 2013	(r248538)
@@ -1289,10 +1289,12 @@ dsl_dataset_snapshot(nvlist_t *snaps, nv
 
 #ifdef __FreeBSD__
 #ifdef _KERNEL
-	for (pair = nvlist_next_nvpair(snaps, NULL); pair != NULL;
-	    pair = nvlist_next_nvpair(snaps, pair)) {
-		char *snapname = nvpair_name(pair);
-		zvol_create_minors(snapname);
+	if (error == 0) {
+		for (pair = nvlist_next_nvpair(snaps, NULL); pair != NULL;
+		    pair = nvlist_next_nvpair(snaps, pair)) {
+			char *snapname = nvpair_name(pair);
+			zvol_create_minors(snapname);
+		}
 	}
 #endif
 #endif