Deleted Added
full compact
spa.c (243503) spa.c (243505)
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 5971 unchanged lines hidden (view full) ---

5980 if (list_is_empty(&spa->spa_config_dirty_list))
5981 return;
5982
5983 spa_config_enter(spa, SCL_STATE, FTAG, RW_READER);
5984
5985 config = spa_config_generate(spa, spa->spa_root_vdev,
5986 dmu_tx_get_txg(tx), B_FALSE);
5987
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 5971 unchanged lines hidden (view full) ---

5980 if (list_is_empty(&spa->spa_config_dirty_list))
5981 return;
5982
5983 spa_config_enter(spa, SCL_STATE, FTAG, RW_READER);
5984
5985 config = spa_config_generate(spa, spa->spa_root_vdev,
5986 dmu_tx_get_txg(tx), B_FALSE);
5987
5988 /*
5989 * If we're upgrading the spa version then make sure that
5990 * the config object gets updated with the correct version.
5991 */
5992 if (spa->spa_ubsync.ub_version < spa->spa_uberblock.ub_version)
5993 fnvlist_add_uint64(config, ZPOOL_CONFIG_VERSION,
5994 spa->spa_uberblock.ub_version);
5995
5988 spa_config_exit(spa, SCL_STATE, FTAG);
5989
5990 if (spa->spa_config_syncing)
5991 nvlist_free(spa->spa_config_syncing);
5992 spa->spa_config_syncing = config;
5993
5994 spa_sync_nvlist(spa, spa->spa_config_object, config, tx);
5995}

--- 643 unchanged lines hidden ---
5996 spa_config_exit(spa, SCL_STATE, FTAG);
5997
5998 if (spa->spa_config_syncing)
5999 nvlist_free(spa->spa_config_syncing);
6000 spa->spa_config_syncing = config;
6001
6002 spa_sync_nvlist(spa, spa->spa_config_object, config, tx);
6003}

--- 643 unchanged lines hidden ---