svn commit: r248538 - projects/libzfs_core/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Martin Matuska]

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