summaryrefslogtreecommitdiffstats
path: root/cddl
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2011-09-28 11:57:10 +0000
committermm <mm@FreeBSD.org>2011-09-28 11:57:10 +0000
commit444642eb38a412e2dc6dc790a370f2c6ea209ebf (patch)
treee4c7b65ac58f2f6f0d65e153f649719bd6a8d6cb /cddl
parent2e8e044c2fd777a22fe0e18a64666670c4b72dd7 (diff)
downloadFreeBSD-src-444642eb38a412e2dc6dc790a370f2c6ea209ebf.zip
FreeBSD-src-444642eb38a412e2dc6dc790a370f2c6ea209ebf.tar.gz
Remove assertion that prevents zfs rename of datasets with mountpoint=none
or mountpoint=legacy that have children datasets. This also fixes dataset rename when receiving incremental snapshots as reported on freebsd-fs@ This assertion was made triggerable by opensolaris change #10196. PR: bin/160400 Reviewed by: pjd MFC after: 1 week
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c
index 4328d38..84b9300 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c
@@ -467,7 +467,6 @@ change_one(zfs_handle_t *zhp, void *data)
* This is necessary when the original mountpoint
* is legacy or none.
*/
- ASSERT(!clp->cl_alldependents);
verify(uu_list_insert_before(clp->cl_list,
uu_list_first(clp->cl_list), cn) == 0);
}
OpenPOWER on IntegriCloud