diff options
| author | Tom Erickson <Tom.Erickson@Sun.COM> | 2009-11-09 20:45:32 -0800 |
|---|---|---|
| committer | Tom Erickson <Tom.Erickson@Sun.COM> | 2009-11-09 20:45:32 -0800 |
| commit | 92241e0b80813d0b83c08e730a29b9d1831794fc (patch) | |
| tree | ae911ea5f6928508430420730ad8dba20b5b3aa2 /usr/src/cmd/zfs/zfs_iter.c | |
| parent | 8d4cf8d8d2965ea43bccdc838f15c18634fee02d (diff) | |
| download | illumos-joyent-92241e0b80813d0b83c08e730a29b9d1831794fc.tar.gz | |
PSARC 2009/510 ZFS received properties
6850025 want to preserve local properties for zfs_recv
6839260 want zfs send with properties
6855486 zfs_receive should keep trying to set properties even after some fail
6850030 snapshots on read-only dataset shouldn't affect zfs_receive
Diffstat (limited to 'usr/src/cmd/zfs/zfs_iter.c')
| -rw-r--r-- | usr/src/cmd/zfs/zfs_iter.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/cmd/zfs/zfs_iter.c b/usr/src/cmd/zfs/zfs_iter.c index 04dd2bdeb2..f70bebe00b 100644 --- a/usr/src/cmd/zfs/zfs_iter.c +++ b/usr/src/cmd/zfs/zfs_iter.c @@ -107,7 +107,8 @@ zfs_callback(zfs_handle_t *zhp, void *data) zfs_prune_proplist(zhp, cb->cb_props_table); - if (zfs_expand_proplist(zhp, cb->cb_proplist) + if (zfs_expand_proplist(zhp, cb->cb_proplist, + (cb->cb_flags & ZFS_ITER_RECVD_PROPS)) != 0) { free(node); return (-1); |