diff options
| author | LOLi <[email protected]> | 2016-12-22 19:39:00 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-12-22 10:39:00 -0800 |
| commit | 3500a145952e0dfb7b7efe1c6b7856319815628c (patch) | |
| tree | 31fcd559fde03217d0db4df9818f7e10902d1738 /module/zfs | |
| parent | 547c5936613ef296559eda5177b6391cfbbfb5c6 (diff) | |
Don't persist temporary pool name on devices
Fix a regression accidentally introduced by e0ab3ab.
Additionally, add a new script zpool_import_014_pos.ksh to
the ZFS test suite to exercise 'zpool import -t' functionality.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #5466
Closes #5515
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/spa_config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/spa_config.c b/module/zfs/spa_config.c index a813dfbd0..4f5d16543 100644 --- a/module/zfs/spa_config.c +++ b/module/zfs/spa_config.c @@ -426,7 +426,7 @@ spa_config_generate(spa_t *spa, vdev_t *vd, uint64_t txg, int getstats) config = fnvlist_alloc(); fnvlist_add_uint64(config, ZPOOL_CONFIG_VERSION, spa_version(spa)); - fnvlist_add_string(config, ZPOOL_CONFIG_POOL_NAME, spa_name(spa)); + fnvlist_add_string(config, ZPOOL_CONFIG_POOL_NAME, pool_name); fnvlist_add_uint64(config, ZPOOL_CONFIG_POOL_STATE, spa_state(spa)); fnvlist_add_uint64(config, ZPOOL_CONFIG_POOL_TXG, txg); fnvlist_add_uint64(config, ZPOOL_CONFIG_POOL_GUID, spa_guid(spa)); |