Deleted Added
full compact
spa.c (277300) spa.c (284304)
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

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

2251 spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
2252 error = spa_config_parse(spa, &rvd, nvroot, NULL, 0, parse);
2253 spa_config_exit(spa, SCL_ALL, FTAG);
2254
2255 if (error != 0)
2256 return (error);
2257
2258 ASSERT(spa->spa_root_vdev == rvd);
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

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

2251 spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
2252 error = spa_config_parse(spa, &rvd, nvroot, NULL, 0, parse);
2253 spa_config_exit(spa, SCL_ALL, FTAG);
2254
2255 if (error != 0)
2256 return (error);
2257
2258 ASSERT(spa->spa_root_vdev == rvd);
2259 ASSERT3U(spa->spa_min_ashift, >=, SPA_MINBLOCKSHIFT);
2260 ASSERT3U(spa->spa_max_ashift, <=, SPA_MAXBLOCKSHIFT);
2259
2260 if (type != SPA_IMPORT_ASSEMBLE) {
2261 ASSERT(spa_guid(spa) == pool_guid);
2262 }
2263
2264 /*
2265 * Try to open all vdevs, loading each label in the process.
2266 */

--- 4729 unchanged lines hidden ---
2261
2262 if (type != SPA_IMPORT_ASSEMBLE) {
2263 ASSERT(spa_guid(spa) == pool_guid);
2264 }
2265
2266 /*
2267 * Try to open all vdevs, loading each label in the process.
2268 */

--- 4729 unchanged lines hidden ---