svn commit: r205198 - in head/cddl/contrib/opensolaris: cmd/zfs lib/libzfs/common

[Andriy Gapon]

on 16/03/2010 02:48 Xin LI said the following:
> Author: delphij
> Date: Tue Mar 16 00:48:27 2010
> New Revision: 205198
> URL: http://svn.freebsd.org/changeset/base/205198
> 
> Log:
>   Merge OpenSolaris revision 8802:010b31dd4c53:
>   
>   6773366 "zfs list" memory consumption can be further reduced
>   
>   PR:		bin/144720
>   Submitted by:	mm
>   Approved by:	pjd
>   Obtained from:	OpenSolaris
>   MFC after:	1 month

It seems that this commit causes a crash in zfs(1) when e.g. 'zfs list' is
executed and one of the filesystems has a user property set on it.

The crash is in zfs_prune_proplist function at
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c:4291.

Relevant code snippet:
4286
4287            while (curr) {
4288                    zfs_prop_t zfs_prop = zfs_name_to_prop(nvpair_name(curr));
4289                    nvpair_t *next = nvlist_next_nvpair(zhp->zfs_props, curr);
4290
4291                    if (props[zfs_prop] == B_FALSE)
4292                            (void) nvlist_remove(zhp->zfs_props,
4293                                nvpair_name(curr), nvpair_type(curr));
4294                    curr = next;
4295            }

zfs_prop is (-1) and nvpair_name(curr) is my custom property "avg:nobackup".
Not sure if this was fixed in OpenSolaris or what.

-- 
Andriy Gapon