Author: mm
Date: Wed Oct  5 20:00:50 2011
New Revision: 226045
URL: http://svn.freebsd.org/changeset/base/226045

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

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

Modified: 
stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c
==============================================================================
--- stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c     
Wed Oct  5 19:57:59 2011        (r226044)
+++ stable/8/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c     
Wed Oct  5 20:00:50 2011        (r226045)
@@ -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);
                }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to