diff options
| author | George Wilson <[email protected]> | 2013-10-04 14:13:23 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-07-17 11:37:57 -0700 |
| commit | 2fbc542ebdee773ab45fd0d35029d6978aa5900b (patch) | |
| tree | a8fca77ea12b3e55a682f962401cf713ebdbb7bd /module/zfs/spa.c | |
| parent | f4a4046bd60523c2d5d9c3ed85e74c3d08638393 (diff) | |
Illumos 4168, 4169, 4170: ztest, zdb and zhack fixes
4168 ztest assertion failure in dbuf_undirty
4169 verbatim import causes zdb to segfault
4170 zhack leaves pool in ACTIVE state
Reviewed by: Adam Leventhal <[email protected]>
Reviewed by: Eric Schrock <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Approved by: Dan McDonald <[email protected]>
References:
https://www.illumos.org/issues/4168
https://www.illumos.org/issues/4169
https://www.illumos.org/issues/4170
https://github.com/illumos/illumos-gate/commit/7fdd916
Porting notes:
Of particular interest when troubleshooting corrupted pools, the
commonly-used "zdb -e" operation may perform verbatim imports and
furthermore, it will soon have direct support for verbatim imports via
a new "-V" option. The 4169 fix eliminates a common segfault case in
which spa_history_log_version() tries to access an un-opened dsl_pool_t.
Ported by: Tim Chase <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #2451
Closes #2283
Closes #2467
Diffstat (limited to 'module/zfs/spa.c')
| -rw-r--r-- | module/zfs/spa.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/module/zfs/spa.c b/module/zfs/spa.c index 6a5d48aab..0d0499c63 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -3901,8 +3901,6 @@ spa_import(char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags) spa_config_sync(spa, B_FALSE, B_TRUE); mutex_exit(&spa_namespace_lock); - spa_history_log_version(spa, "import"); - return (0); } |