Date: Wed, 14 Nov 2012 00:40:40 +0000 (UTC) From: Martin Matuska <mm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r243012 - vendor-sys/illumos/dist/uts/common vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/cmd/ztest Message-ID: <201211140040.qAE0eeXV055902@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mm Date: Wed Nov 14 00:40:40 2012 New Revision: 243012 URL: http://svnweb.freebsd.org/changeset/base/243012 Log: Update vendor/illumos/dist and vendor/illumos-sys/dist to illumos-gate 13886:e3261d03efbf (illumos zfs issue #3349) Modified: vendor-sys/illumos/dist/uts/common/Makefile.files vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Changes in other areas also in this revision: Modified: vendor/illumos/dist/cmd/ztest/ztest.c Modified: vendor-sys/illumos/dist/uts/common/Makefile.files ============================================================================== --- vendor-sys/illumos/dist/uts/common/Makefile.files Wed Nov 14 00:34:11 2012 (r243011) +++ vendor-sys/illumos/dist/uts/common/Makefile.files Wed Nov 14 00:40:40 2012 (r243012) @@ -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 Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c ============================================================================== --- vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Wed Nov 14 00:34:11 2012 (r243011) +++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c Wed Nov 14 00:40:40 2012 (r243012) @@ -5718,6 +5718,14 @@ spa_sync_config_object(spa_t *spa, dmu_t 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211140040.qAE0eeXV055902>