diff options
| author | Tom Caputi <[email protected]> | 2018-05-01 14:24:20 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-05-01 11:24:20 -0700 |
| commit | 2c24b5b1487646f68960f25e13a1b0df645d4f49 (patch) | |
| tree | 3f4ad2ba92d441d6a8b132daaa93f69024b6a71e /tests/runfiles | |
| parent | d6133fc500ea8b4fdc1a51944cb17ea5e70f3137 (diff) | |
Fix issues found with zfs diff
Two deadlocks / ASSERT failures were introduced in a2c2ed1b which
would occur whenever arc_buf_fill() failed to decrypt a block of
data. This occurred because the call to arc_buf_destroy() which
was responsible for cleaning up the newly created buffer would
attempt to take out the hdr lock that it was already holding. This
was resolved by calling the underlying functions directly without
retaking the lock.
In addition, the dmu_diff() code did not properly ensure that keys
were loaded and mapped before begining dataset traversal. It turns
out that this code does not need to look at any encrypted values,
so the code was altered to perform raw IO only.
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Tom Caputi <[email protected]>
Closes #7354
Closes #7456
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 6dc4df96c..62dfcf44e 100644 --- a/tests/runfiles/linux.run +++ b/tests/runfiles/linux.run @@ -150,7 +150,7 @@ tags = ['functional', 'cli_root', 'zfs_destroy'] [tests/functional/cli_root/zfs_diff] tests = ['zfs_diff_changes', 'zfs_diff_cliargs', 'zfs_diff_timestamp', - 'zfs_diff_types'] + 'zfs_diff_types', 'zfs_diff_encrypted'] tags = ['functional', 'cli_root', 'zfs_diff'] [tests/functional/cli_root/zfs_get] |