diff options
| author | LOLi <[email protected]> | 2016-12-21 03:46:59 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-12-20 18:46:59 -0800 |
| commit | 5f1346c29997dd4e02acf4c19c875d5484f33b1e (patch) | |
| tree | af7d163de6a51282e16c4e8f02f8689a4ef1511f /tests/runfiles | |
| parent | a3823f428deb8f15dd383dc6210b2e16926f4217 (diff) | |
Fix dsl_props_set_sync_impl to work with nested nvlist
When iterating over the input nvlist in dsl_props_set_sync_impl() when we don't
preserve the nvpair name before looking up ZPROP_VALUE, so when we later go to
process it nvpair_name() is always "value" and not the actual property name.
This fixes a couple of bugs in zfs_ioc_recv():
* Received properties were not restored correctly when failing to receive an
incremental send stream
* Received properties were not completely replaced by the new ones when
successfully receiving an incremental send stream
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #5497
Diffstat (limited to 'tests/runfiles')
| -rw-r--r-- | tests/runfiles/linux.run | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run index 5e16395b9..5ceebefeb 100644 --- a/tests/runfiles/linux.run +++ b/tests/runfiles/linux.run @@ -147,7 +147,7 @@ tests = ['zfs_receive_001_pos', 'zfs_receive_002_pos', 'zfs_receive_003_pos', 'zfs_receive_005_neg', 'zfs_receive_006_pos', 'zfs_receive_007_neg', 'zfs_receive_008_pos', 'zfs_receive_009_neg', 'zfs_receive_010_pos', 'zfs_receive_011_pos', 'zfs_receive_012_pos', - 'zfs_receive_013_pos'] + 'zfs_receive_013_pos', 'zfs_receive_014_pos'] [tests/functional/cli_root/zfs_rename] tests = ['zfs_rename_001_pos', 'zfs_rename_002_pos', 'zfs_rename_003_pos', |