usr/src/cmd/zoneadm/zfs.c
changeset 10242 c40d075fbca6
parent 9386 8fc9dca843a1
child 11276 4569547d4c39
--- a/usr/src/cmd/zoneadm/zfs.c	Sat Aug 01 11:59:47 2009 -0700
+++ b/usr/src/cmd/zoneadm/zfs.c	Sat Aug 01 15:09:50 2009 -0600
@@ -671,7 +671,7 @@
 	}
 
 	if (zfs_unmount(zhp, NULL, 0) == 0) {
-		(void) zfs_destroy(zhp);
+		(void) zfs_destroy(zhp, B_FALSE);
 	}
 
 	zfs_close(zhp);
@@ -961,7 +961,7 @@
 		if ((zhp = zfs_open(g_zfs, snap_name, ZFS_TYPE_SNAPSHOT))
 		    != NULL) {
 			if (zfs_unmount(zhp, NULL, 0) == 0)
-				(void) zfs_destroy(zhp);
+				(void) zfs_destroy(zhp, B_FALSE);
 			zfs_close(zhp);
 		}
 
@@ -1018,7 +1018,7 @@
 	if (zfs_mount(zhp, NULL, 0) != 0) {
 		(void) fprintf(stderr, gettext("cannot mount ZFS dataset %s: "
 		    "%s\n"), zfs_name, libzfs_error_description(g_zfs));
-		(void) zfs_destroy(zhp);
+		(void) zfs_destroy(zhp, B_FALSE);
 	} else {
 		if (chmod(zonepath, S_IRWXU) != 0) {
 			(void) fprintf(stderr, gettext("file system %s "
@@ -1085,7 +1085,7 @@
 		return (Z_ERR);
 	}
 
-	if (zfs_destroy(zhp) != 0) {
+	if (zfs_destroy(zhp, B_FALSE) != 0) {
 		/*
 		 * If the destroy fails for some reason, try to remount
 		 * the file system so that we can use "rm -rf" to clean up
@@ -1118,7 +1118,7 @@
 		    ZFS_TYPE_SNAPSHOT)) != NULL) {
 			if (zfs_iter_dependents(ohp, B_TRUE, has_dependent,
 			    NULL) == 0 && zfs_unmount(ohp, NULL, 0) == 0)
-				(void) zfs_destroy(ohp);
+				(void) zfs_destroy(ohp, B_FALSE);
 			zfs_close(ohp);
 		}
 	}