From owner-svn-src-all@FreeBSD.ORG  Thu Apr 15 05:59:31 2010
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 C5A79106564A;
	Thu, 15 Apr 2010 05:59:31 +0000 (UTC) (envelope-from avg@freebsd.org)
Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140])
	by mx1.freebsd.org (Postfix) with ESMTP id 370008FC13;
	Thu, 15 Apr 2010 05:59:29 +0000 (UTC)
Received: from porto.topspin.kiev.ua (porto-e.starpoint.kiev.ua
	[212.40.38.100])
	by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id IAA18418;
	Thu, 15 Apr 2010 08:59:28 +0300 (EEST)
	(envelope-from avg@freebsd.org)
Received: from localhost.topspin.kiev.ua ([127.0.0.1])
	by porto.topspin.kiev.ua with esmtp (Exim 4.34 (FreeBSD))
	id 1O2I6q-0004lE-Fp; Thu, 15 Apr 2010 08:59:28 +0300
Message-ID: <4BC6AB3F.6090605@freebsd.org>
Date: Thu, 15 Apr 2010 08:59:27 +0300
From: Andriy Gapon <avg@freebsd.org>
User-Agent: Thunderbird 2.0.0.24 (X11/20100321)
MIME-Version: 1.0
To: Xin LI <delphij@freebsd.org>
References: <201004150125.o3F1PHAT044831@svn.freebsd.org>
In-Reply-To: <201004150125.o3F1PHAT044831@svn.freebsd.org>
X-Enigmail-Version: 0.96.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, svn-src-stable-8@freebsd.org
Subject: Re: svn commit: r206642 - in stable/8/cddl/contrib/opensolaris:
 cmd/zfs 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: Thu, 15 Apr 2010 05:59:31 -0000

on 15/04/2010 04:25 Xin LI said the following:
> Author: delphij
> Date: Thu Apr 15 01:25:17 2010
> New Revision: 206642
> URL: http://svn.freebsd.org/changeset/base/206642
> 
> Log:
>   MFC r205200 + r206199
>   
>   Merge OpenSolaris revision 9396:f41cf682d0d3:
>   
>   6830813 zfs list -t all fails assertion
>   
>   *Note that this is only a partial merge of this revision addressing only
>   this one issue.*
>   
>   PR:		bin/144720
>   Submitted by:	mm

Oh here it is :)
The window between the commits is sufficiently small, but I still think that it
would have been better to MFC the fix in one go.

> -		if (props[zfs_prop] == B_FALSE)
> +		/*
> +		 * We leave user:props in the nvlist, so there will be
> +		 * some ZPROP_INVAL.  To be extra safe, don't prune
> +		 * those.
> +		 */
> +		if (zfs_prop != ZPROP_INVAL && props[zfs_prop] == B_FALSE)
>  			(void) nvlist_remove(zhp->zfs_props,
>  			    nvpair_name(curr), nvpair_type(curr));
>  		curr = next;


-- 
Andriy Gapon