diff options
| author | mm <mm@FreeBSD.org> | 2012-07-13 12:37:34 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-07-13 12:37:34 +0000 |
| commit | 98fa6a1cdbda0168d4fbbf91839fd17b4f842873 (patch) | |
| tree | 0b26862b3421ec92b92c483a3af03f3ae2c00c67 /cddl/contrib/opensolaris/cmd/zfs | |
| parent | 73c1cd9e1135a5f68cebf28e8d0b1353df844fa8 (diff) | |
| download | FreeBSD-src-98fa6a1cdbda0168d4fbbf91839fd17b4f842873.zip FreeBSD-src-98fa6a1cdbda0168d4fbbf91839fd17b4f842873.tar.gz | |
Merge illumos commit 13749:df4cd82e2b60
1796 "ZFS HOLD" should not be used when doing "ZFS SEND" froma read-only pool
2871 support for __ZFS_POOL_RESTRICT used by ZFS test suite
2903 zfs destroy -d does not work
2957 zfs destroy -R/r sometimes fails when removing defer-destroyed snapshot
References:
https://www.illumos.org/issues/1796
https://www.illumos.org/issues/2871
https://www.illumos.org/issues/2903
https://www.illumos.org/issues/2957
MFC after: 1 week
Diffstat (limited to 'cddl/contrib/opensolaris/cmd/zfs')
| -rw-r--r-- | cddl/contrib/opensolaris/cmd/zfs/zfs_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c index 2f2b070..1b91dca 100644 --- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c +++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c @@ -1092,7 +1092,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, |
