From owner-svn-src-all@FreeBSD.ORG  Wed Oct  5 19:58:00 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4AD8B1065670;
	Wed,  5 Oct 2011 19:58:00 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 39BF18FC12;
	Wed,  5 Oct 2011 19:58:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p95Jw0DN026506;
	Wed, 5 Oct 2011 19:58:00 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p95Jw0lb026504;
	Wed, 5 Oct 2011 19:58:00 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201110051958.p95Jw0lb026504@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Wed, 5 Oct 2011 19:58:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226044 -
	stable/9/cddl/contrib/opensolaris/lib/libzfs/common
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Oct 2011 19:58:00 -0000

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);
 		}