diff options
| author | mm <mm@FreeBSD.org> | 2012-11-14 00:40:40 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-11-14 00:40:40 +0000 |
| commit | ef577b7252cdfa64f3326232eecedcb786e4cecb (patch) | |
| tree | 020b90262b46e597f95eb432c8fec73c9d41d54f | |
| parent | 3a85e6f9578fcce7e8e00e9197b239b19148e297 (diff) | |
| download | FreeBSD-src-ef577b7252cdfa64f3326232eecedcb786e4cecb.zip FreeBSD-src-ef577b7252cdfa64f3326232eecedcb786e4cecb.tar.gz | |
Update vendor/illumos/dist and vendor/illumos-sys/dist
to illumos-gate 13886:e3261d03efbf
(illumos zfs issue #3349)
| -rw-r--r-- | uts/common/Makefile.files | 2 | ||||
| -rw-r--r-- | uts/common/fs/zfs/spa.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/uts/common/Makefile.files b/uts/common/Makefile.files index baeb7b0..b20ff8c 100644 --- a/uts/common/Makefile.files +++ b/uts/common/Makefile.files @@ -1995,7 +1995,7 @@ MEGA_SAS_OBJS = megaraid_sas.o # # MR_SAS module # -MR_SAS_OBJS = mr_sas.o +MR_SAS_OBJS = ld_pd_map.o mr_sas.o mr_sas_tbolt.o mr_sas_list.o # # ISCSI_INITIATOR module diff --git a/uts/common/fs/zfs/spa.c b/uts/common/fs/zfs/spa.c index 4ffa541..4988b50 100644 --- a/uts/common/fs/zfs/spa.c +++ b/uts/common/fs/zfs/spa.c @@ -5718,6 +5718,14 @@ spa_sync_config_object(spa_t *spa, dmu_tx_t *tx) config = spa_config_generate(spa, spa->spa_root_vdev, dmu_tx_get_txg(tx), B_FALSE); + /* + * If we're upgrading the spa version then make sure that + * the config object gets updated with the correct version. + */ + if (spa->spa_ubsync.ub_version < spa->spa_uberblock.ub_version) + fnvlist_add_uint64(config, ZPOOL_CONFIG_VERSION, + spa->spa_uberblock.ub_version); + spa_config_exit(spa, SCL_STATE, FTAG); if (spa->spa_config_syncing) |
