diff options
| author | timf <none@none> | 2007-07-05 11:39:17 -0700 |
|---|---|---|
| committer | timf <none@none> | 2007-07-05 11:39:17 -0700 |
| commit | d3c8f894e9437d361ba78d09f792b0cb1ac89b6a (patch) | |
| tree | 47d169b7a973c9bb34416159a434b79f8f94e2ca /usr/src/lib | |
| parent | b510d37840323dfb912eab2c7f56325938ed47ad (diff) | |
| download | illumos-joyent-d3c8f894e9437d361ba78d09f792b0cb1ac89b6a.tar.gz | |
6509186 "zfs set" should list properties in alphabetical order
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_dataset.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_impl.h | 3 | ||||
| -rw-r--r-- | usr/src/lib/libzfs/common/mapfile-vers | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c index 6990b20dff..62cdb085c0 100644 --- a/usr/src/lib/libzfs/common/libzfs_dataset.c +++ b/usr/src/lib/libzfs/common/libzfs_dataset.c @@ -4609,7 +4609,7 @@ zfs_expand_proplist_common(libzfs_handle_t *hdl, zfs_proplist_t **plp, exp.hdl = hdl; if (zfs_prop_iter_common(zfs_expand_proplist_cb, &exp, type, - B_FALSE) == ZFS_PROP_INVAL) + B_FALSE, B_FALSE) == ZFS_PROP_INVAL) return (-1); /* diff --git a/usr/src/lib/libzfs/common/libzfs_impl.h b/usr/src/lib/libzfs/common/libzfs_impl.h index 76f4823f29..74a799153c 100644 --- a/usr/src/lib/libzfs/common/libzfs_impl.h +++ b/usr/src/lib/libzfs/common/libzfs_impl.h @@ -111,7 +111,8 @@ int zfs_expand_proplist_common(libzfs_handle_t *, zfs_proplist_t **, zfs_type_t); int zfs_get_proplist_common(libzfs_handle_t *, char *, zfs_proplist_t **, zfs_type_t); -zfs_prop_t zfs_prop_iter_common(zfs_prop_f, void *, zfs_type_t, boolean_t); +zfs_prop_t zfs_prop_iter_common(zfs_prop_f, void *, zfs_type_t, boolean_t, + boolean_t); zfs_prop_t zfs_name_to_prop_common(const char *, zfs_type_t); nvlist_t *zfs_validate_properties(libzfs_handle_t *, zfs_type_t, char *, diff --git a/usr/src/lib/libzfs/common/mapfile-vers b/usr/src/lib/libzfs/common/mapfile-vers index 53e75e9323..2ab83ae2e9 100644 --- a/usr/src/lib/libzfs/common/mapfile-vers +++ b/usr/src/lib/libzfs/common/mapfile-vers @@ -83,6 +83,7 @@ SUNWprivate_1.1 { zfs_prop_inheritable; zfs_prop_is_string; zfs_prop_iter; + zfs_prop_iter_ordered; zfs_prop_readonly; zfs_prop_set; zfs_prop_string_to_index; |