proxmox-mirrors/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs synced 2025-04-28 18:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

JSON: fix user properties output for zfs list

Browse Source 
This commit fixes JSON output for zfs list when user properties are
requested with -o flag. This case needed to be handled specifically
since zfs_prop_to_name does not return property name for user
properties, instead it is stored in pl->pl_user_prop.

Reviewed-by: Ameer Hamza <ahamza@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Signed-off-by: Umer Saleem <usaleem@ixsystems.com>
Closes #16732
This commit is contained in:
Umer Saleem 2024-11-08 00:31:14 +05:00 committed by Brian Behlendorf
parent e12d76176d
commit 9061a4da0b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/zfs/zfs_main.c
View File

@ -3761,8 +3761,13 @@ collect_dataset(zfs_handle_t *zhp, list_cbdata_t *cb)
if (cb->cb_json) { if (cb->cb_json) {
if (pl->pl_prop == ZFS_PROP_NAME) if (pl->pl_prop == ZFS_PROP_NAME)
continue; continue;
const char *prop_name;
if (pl->pl_prop != ZPROP_USERPROP)
prop_name = zfs_prop_to_name(pl->pl_prop);
else
prop_name = pl->pl_user_prop;
if (zprop_nvlist_one_property( if (zprop_nvlist_one_property(
zfs_prop_to_name(pl->pl_prop), propstr, prop_name, propstr,
sourcetype, source, NULL, props, sourcetype, source, NULL, props,
cb->cb_json_as_int) != 0) cb->cb_json_as_int) != 0)
nomem(); nomem();