diff options
| author | Xin LI <delphij@FreeBSD.org> | 2010-04-05 18:27:58 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2010-04-05 18:27:58 +0000 |
| commit | 7546d4b74ef18dbdcef396df2c283157782f8872 (patch) | |
| tree | 6f4a9b5242c6a15c48ea0491628e6f78f470e59a /cddl/contrib | |
| parent | 863a6d6bbf2b844c483438baa3f4f2af13006f0d (diff) | |
| download | src-7546d4b74ef18dbdcef396df2c283157782f8872.tar.gz src-7546d4b74ef18dbdcef396df2c283157782f8872.zip | |
Refine previous partial merge of OpenSolaris onnv revision 9396:f41cf682d0d3.
This fixes a regression that zfs list would crash on zfs having user properties.
PR: kern/145377
Submitted by: mm
Approved by: pjd
Obtained from: OpenSolaris
MFC after: 10 days
Notes
Notes:
svn path=/head/; revision=206199
Diffstat (limited to 'cddl/contrib')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c index 51adc40d1784..eb0a1fea75c1 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c @@ -4288,7 +4288,12 @@ zfs_prune_proplist(zfs_handle_t *zhp, uint8_t *props) zfs_prop_t zfs_prop = zfs_name_to_prop(nvpair_name(curr)); nvpair_t *next = nvlist_next_nvpair(zhp->zfs_props, curr); - 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; |