diff options
| author | Paul Dagnelie <[email protected]> | 2022-01-06 11:12:53 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-01-06 11:12:53 -0800 |
| commit | 399b98198ae2e7c003448bf6b9508879c2a3ed83 (patch) | |
| tree | ac75993028048d6069069306697dbb573af89391 /module/zfs/zfs_ioctl.c | |
| parent | 0175272f6463dcfe588480c459c065cc4a78ba08 (diff) | |
Revert "zfs list: Allow more fields in ZFS_ITER_SIMPLE mode"
This reverts commit f6a0dac84af2fba9c306a3a307ea7aafcbe32d2b.
Reviewed-by: Matthew Ahrens <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Mark Maybee <[email protected]>
Signed-off-by: Paul Dagnelie <[email protected]>
Closes #12938
Diffstat (limited to 'module/zfs/zfs_ioctl.c')
| -rw-r--r-- | module/zfs/zfs_ioctl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index 065540bbd..ca2da5612 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -2044,7 +2044,7 @@ zfs_ioc_objset_stats_impl(zfs_cmd_t *zc, objset_t *os) dmu_objset_fast_stat(os, &zc->zc_objset_stats); - if (!zc->zc_simple && zc->zc_nvlist_dst != 0 && + if (zc->zc_nvlist_dst != 0 && (error = dsl_prop_get_all(os, &nv)) == 0) { dmu_objset_stats(os, nv); /* @@ -2331,7 +2331,6 @@ zfs_ioc_snapshot_list_next(zfs_cmd_t *zc) } if (zc->zc_simple) { - dsl_dataset_fast_stat(ds, &zc->zc_objset_stats); dsl_dataset_rele(ds, FTAG); break; } |