Illumos #3090 and #3102

[zfs.git] / cmd / zfs / zfs_main.c

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index d185a31..797c7a5 100644 (file)
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -23,6 +23,7 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  */
 
 #include <assert.h>
@@ -1066,7 +1067,7 @@ snapshot_to_nvl_cb(zfs_handle_t *zhp, void *arg)
        int err = 0;
 
        /* Check for clones. */
-       if (!cb->cb_doclones) {
+       if (!cb->cb_doclones && !cb->cb_defer_destroy) {
                cb->cb_target = zhp;
                cb->cb_first = B_TRUE;
                err = zfs_iter_dependents(zhp, B_TRUE,
@@ -3551,6 +3552,7 @@ zfs_do_send(int argc, char **argv)
                        if (flags.verbose)
                                extraverbose = B_TRUE;
                        flags.verbose = B_TRUE;
+                       flags.progress = B_TRUE;
                        break;
                case 'D':
                        flags.dedup = B_TRUE;