Print this page
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 <ahl@delphix.com>
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/zfs/spa.c
          +++ new/usr/src/uts/common/fs/zfs/spa.c
↓ open down ↓ 3834 lines elided ↑ open up ↑
3835 3835           * Verbatim import - Take a pool and insert it into the namespace
3836 3836           * as if it had been loaded at boot.
3837 3837           */
3838 3838          if (spa->spa_import_flags & ZFS_IMPORT_VERBATIM) {
3839 3839                  if (props != NULL)
3840 3840                          spa_configfile_set(spa, props, B_FALSE);
3841 3841  
3842 3842                  spa_config_sync(spa, B_FALSE, B_TRUE);
3843 3843  
3844 3844                  mutex_exit(&spa_namespace_lock);
3845      -                spa_history_log_version(spa, "import");
3846      -
3847 3845                  return (0);
3848 3846          }
3849 3847  
3850 3848          spa_activate(spa, mode);
3851 3849  
3852 3850          /*
3853 3851           * Don't start async tasks until we know everything is healthy.
3854 3852           */
3855 3853          spa_async_suspend(spa);
3856 3854  
↓ open down ↓ 2669 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX