svn commit: r206642 - in stable/8/cddl/contrib/opensolaris: cmd/zfs lib/libzfs/common

[Andriy Gapon]

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