Date: Wed, 28 Sep 2011 11:57:10 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r225828 - head/cddl/contrib/opensolaris/lib/libzfs/common Message-ID: <201109281157.p8SBvAdx071982@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Wed Sep 28 11:57:10 2011 New Revision: 225828 URL: http://svn.freebsd.org/changeset/base/225828 Log: 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 Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c ============================================================================== --- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c Wed Sep 28 08:47:17 2011 (r225827) +++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c Wed Sep 28 11:57:10 2011 (r225828) @@ -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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109281157.p8SBvAdx071982>