diff options
author | LOLi <[email protected]> | 2017-06-02 16:17:00 +0200 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2017-06-02 07:17:00 -0700 |
commit | 92aceb2a7ee8c9367fdc901fed933f6f258173e0 (patch) | |
tree | b05170d226a597196ab3389d9c798d01908b76dc /tests/runfiles/linux.run | |
parent | b870c4b5d716d87ddfb29f28745e639dd635fd5f (diff) |
Fix "snapdev" property issues
When inheriting the "snapdev" property to we don't always call
zfs_prop_set_special(): this prevents device nodes from being created in
certain situations. Because "snapdev" is the only *special* property
that is also inheritable we need to call zfs_prop_set_special() even
when we're not reverting it to the received value ('zfs inherit -S').
Additionally, fix a NULL pointer dereference accidentally introduced in
5559ba0 that can be triggered when setting the "snapdev" property to
the value "hidden" twice.
Finally, add a new test case "zvol_misc_snapdev" to the ZFS Test Suite.
Reviewed by: Boris Protopopov <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #6131
Closes #6175
Closes #6176
Diffstat (limited to 'tests/runfiles/linux.run')
-rw-r--r-- | tests/runfiles/linux.run | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run index 7e64c6714..674684f1f 100644 --- a/tests/runfiles/linux.run +++ b/tests/runfiles/linux.run @@ -564,7 +564,8 @@ tests = ['zvol_cli_001_pos', 'zvol_cli_002_pos', 'zvol_cli_003_neg'] [tests/functional/zvol/zvol_misc] tests = ['zvol_misc_001_neg', 'zvol_misc_002_pos', 'zvol_misc_003_neg', - 'zvol_misc_004_pos', 'zvol_misc_005_neg', 'zvol_misc_006_pos'] + 'zvol_misc_004_pos', 'zvol_misc_005_neg', 'zvol_misc_006_pos', + 'zvol_misc_snapdev'] [tests/functional/zvol/zvol_swap] tests = ['zvol_swap_001_pos', 'zvol_swap_002_pos', 'zvol_swap_003_pos', |