svn commit: r226044 - stable/9/cddl/contrib/opensolaris/lib/libzfs/common

[Martin Matuska]

Author: mm
Date: Wed Oct  5 19:57:59 2011
New Revision: 226044
URL: http://svn.freebsd.org/changeset/base/226044

Log:
  MFC r225828:
  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
  Approved by:	re (kib)

Modified:
  stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c
Directory Properties:
  stable/9/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c
==============================================================================
--- stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c	Wed Oct  5 17:29:49 2011	(r226043)
+++ stable/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c	Wed Oct  5 19:57:59 2011	(r226044)
@@ -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);
 		}