Deleted Added
sdiff udiff text old ( 177698 ) new ( 185029 )
full compact
spa_config.c (177698) spa_config.c (185029)
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

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

15 * If applicable, add the following below this CDDL HEADER, with the
16 * fields enclosed by brackets "[]" replaced with your own identifying
17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 *
19 * CDDL HEADER END
20 */
21
22/*
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

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

15 * If applicable, add the following below this CDDL HEADER, with the
16 * fields enclosed by brackets "[]" replaced with your own identifying
17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 *
19 * CDDL HEADER END
20 */
21
22/*
23 * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
23 * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
24 * Use is subject to license terms.
25 */
26
24 * Use is subject to license terms.
25 */
26
27#pragma ident "%Z%%M% %I% %E% SMI"
28
29#include <sys/zfs_context.h>
30#include <sys/spa.h>
31#include <sys/spa_impl.h>
32#include <sys/nvpair.h>
33#include <sys/uio.h>
34#include <sys/fs/zfs.h>
35#include <sys/vdev_impl.h>
36#include <sys/zfs_ioctl.h>
37#include <sys/utsname.h>
38#include <sys/sunddi.h>
39#ifdef _KERNEL
40#include <sys/kobj.h>
41#endif
42
43/*
44 * Pool configuration repository.
45 *
27#include <sys/zfs_context.h>
28#include <sys/spa.h>
29#include <sys/spa_impl.h>
30#include <sys/nvpair.h>
31#include <sys/uio.h>
32#include <sys/fs/zfs.h>
33#include <sys/vdev_impl.h>
34#include <sys/zfs_ioctl.h>
35#include <sys/utsname.h>
36#include <sys/sunddi.h>
37#ifdef _KERNEL
38#include <sys/kobj.h>
39#endif
40
41/*
42 * Pool configuration repository.
43 *
46 * The configuration for all pools, in addition to being stored on disk, is
47 * stored in /etc/zfs/zpool.cache as a packed nvlist. The kernel maintains
48 * this list as pools are created, destroyed, or modified.
44 * Pool configuration is stored as a packed nvlist on the filesystem. By
45 * default, all pools are stored in /etc/zfs/zpool.cache and loaded on boot
46 * (when the ZFS module is loaded). Pools can also have the 'cachefile'
47 * property set that allows them to be stored in an alternate location until
48 * the control of external software.
49 *
49 *
50 * We have a single nvlist which holds all the configuration information. When
51 * the module loads, we read this information from the cache and populate the
52 * SPA namespace. This namespace is maintained independently in spa.c.
53 * Whenever the namespace is modified, or the configuration of a pool is
54 * changed, we call spa_config_sync(), which walks through all the active pools
55 * and writes the configuration to disk.
50 * For each cache file, we have a single nvlist which holds all the
51 * configuration information. When the module loads, we read this information
52 * from /etc/zfs/zpool.cache and populate the SPA namespace. This namespace is
53 * maintained independently in spa.c. Whenever the namespace is modified, or
54 * the configuration of a pool is changed, we call spa_config_sync(), which
55 * walks through all the active pools and writes the configuration to disk.
56 */
57
58static uint64_t spa_config_generation = 1;
59
60/*
61 * This can be overridden in userland to preserve an alternate namespace for
62 * userland pools when doing testing.
63 */
56 */
57
58static uint64_t spa_config_generation = 1;
59
60/*
61 * This can be overridden in userland to preserve an alternate namespace for
62 * userland pools when doing testing.
63 */
64const char *spa_config_dir = ZPOOL_CACHE_DIR;
64const char *spa_config_path = ZPOOL_CACHE;
65
66/*
67 * Called when the module is first loaded, this routine loads the configuration
68 * file into the SPA namespace. It does not actually open or load the pools; it
69 * only populates the namespace.
70 */
71void
72spa_config_load(void)
73{
74 void *buf = NULL;
75 nvlist_t *nvlist, *child;
76 nvpair_t *nvpair;
77 spa_t *spa;
65
66/*
67 * Called when the module is first loaded, this routine loads the configuration
68 * file into the SPA namespace. It does not actually open or load the pools; it
69 * only populates the namespace.
70 */
71void
72spa_config_load(void)
73{
74 void *buf = NULL;
75 nvlist_t *nvlist, *child;
76 nvpair_t *nvpair;
77 spa_t *spa;
78 char pathname[128];
78 char *pathname;
79 struct _buf *file;
80 uint64_t fsize;
81
82 /*
83 * Open the configuration file.
84 */
79 struct _buf *file;
80 uint64_t fsize;
81
82 /*
83 * Open the configuration file.
84 */
85 (void) snprintf(pathname, sizeof (pathname), "%s/%s",
86 spa_config_dir, ZPOOL_CACHE_FILE);
85 pathname = kmem_alloc(MAXPATHLEN, KM_SLEEP);
87
86
87 (void) snprintf(pathname, MAXPATHLEN, "%s", spa_config_path);
88
88 file = kobj_open_file(pathname);
89 file = kobj_open_file(pathname);
90
91 kmem_free(pathname, MAXPATHLEN);
92
89 if (file == (struct _buf *)-1) {
90 ZFS_LOG(1, "Cannot open %s.", pathname);
91 return;
92 }
93
94 if (kobj_get_filesize(file, &fsize) != 0) {
95 ZFS_LOG(1, "Cannot get size of %s.", pathname);
96 goto out;

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

143
144out:
145 if (buf != NULL)
146 kmem_free(buf, fsize);
147
148 kobj_close_file(file);
149}
150
93 if (file == (struct _buf *)-1) {
94 ZFS_LOG(1, "Cannot open %s.", pathname);
95 return;
96 }
97
98 if (kobj_get_filesize(file, &fsize) != 0) {
99 ZFS_LOG(1, "Cannot get size of %s.", pathname);
100 goto out;

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

147
148out:
149 if (buf != NULL)
150 kmem_free(buf, fsize);
151
152 kobj_close_file(file);
153}
154
151/*
152 * Synchronize all pools to disk. This must be called with the namespace lock
153 * held.
154 */
155void
156spa_config_sync(void)
155static void
156spa_config_write(spa_config_dirent_t *dp, nvlist_t *nvl)
157{
157{
158 spa_t *spa = NULL;
159 nvlist_t *config;
160 size_t buflen;
161 char *buf;
162 vnode_t *vp;
163 int oflags = FWRITE | FTRUNC | FCREAT | FOFFMAX;
158 size_t buflen;
159 char *buf;
160 vnode_t *vp;
161 int oflags = FWRITE | FTRUNC | FCREAT | FOFFMAX;
164 char pathname[128];
165 char pathname2[128];
162 char *temp;
166
163
167 ASSERT(MUTEX_HELD(&spa_namespace_lock));
168
169 VERIFY(nvlist_alloc(&config, NV_UNIQUE_NAME, KM_SLEEP) == 0);
170
171 /*
164 /*
172 * Add all known pools to the configuration list, ignoring those with
173 * alternate root paths.
165 * If the nvlist is empty (NULL), then remove the old cachefile.
174 */
166 */
175 spa = NULL;
176 while ((spa = spa_next(spa)) != NULL) {
177 mutex_enter(&spa->spa_config_cache_lock);
178 if (spa->spa_config && spa->spa_name && spa->spa_root == NULL)
179 VERIFY(nvlist_add_nvlist(config, spa->spa_name,
180 spa->spa_config) == 0);
181 mutex_exit(&spa->spa_config_cache_lock);
167 if (nvl == NULL) {
168 (void) vn_remove(dp->scd_path, UIO_SYSSPACE, RMFILE);
169 return;
182 }
183
184 /*
185 * Pack the configuration into a buffer.
186 */
170 }
171
172 /*
173 * Pack the configuration into a buffer.
174 */
187 VERIFY(nvlist_size(config, &buflen, NV_ENCODE_XDR) == 0);
175 VERIFY(nvlist_size(nvl, &buflen, NV_ENCODE_XDR) == 0);
188
189 buf = kmem_alloc(buflen, KM_SLEEP);
176
177 buf = kmem_alloc(buflen, KM_SLEEP);
178 temp = kmem_zalloc(MAXPATHLEN, KM_SLEEP);
190
179
191 VERIFY(nvlist_pack(config, &buf, &buflen, NV_ENCODE_XDR,
180 VERIFY(nvlist_pack(nvl, &buf, &buflen, NV_ENCODE_XDR,
192 KM_SLEEP) == 0);
193
194 /*
195 * Write the configuration to disk. We need to do the traditional
196 * 'write to temporary file, sync, move over original' to make sure we
197 * always have a consistent view of the data.
198 */
181 KM_SLEEP) == 0);
182
183 /*
184 * Write the configuration to disk. We need to do the traditional
185 * 'write to temporary file, sync, move over original' to make sure we
186 * always have a consistent view of the data.
187 */
199 (void) snprintf(pathname, sizeof (pathname), "%s/%s", spa_config_dir,
200 ZPOOL_CACHE_TMP);
188 (void) snprintf(temp, MAXPATHLEN, "%s.tmp", dp->scd_path);
201
189
202 if (vn_open(pathname, UIO_SYSSPACE, oflags, 0644, &vp, CRCREAT, 0) != 0)
203 goto out;
190 if (vn_open(temp, UIO_SYSSPACE, oflags, 0644, &vp, CRCREAT, 0) == 0) {
191 if (vn_rdwr(UIO_WRITE, vp, buf, buflen, 0, UIO_SYSSPACE,
192 0, RLIM64_INFINITY, kcred, NULL) == 0 &&
193 VOP_FSYNC(vp, FSYNC, kcred, NULL) == 0) {
194 (void) vn_rename(temp, dp->scd_path, UIO_SYSSPACE);
195 }
196 (void) VOP_CLOSE(vp, oflags, 1, 0, kcred, NULL);
197 VN_RELE(vp);
198 }
204
199
205 if (vn_rdwr(UIO_WRITE, vp, buf, buflen, 0, UIO_SYSSPACE,
206 0, RLIM64_INFINITY, kcred, NULL) == 0 &&
207 VOP_FSYNC(vp, FSYNC, kcred) == 0) {
208 (void) snprintf(pathname2, sizeof (pathname2), "%s/%s",
209 spa_config_dir, ZPOOL_CACHE_FILE);
210 (void) vn_rename(pathname, pathname2, UIO_SYSSPACE);
200 (void) vn_remove(temp, UIO_SYSSPACE, RMFILE);
201
202 kmem_free(buf, buflen);
203 kmem_free(temp, MAXPATHLEN);
204}
205
206/*
207 * Synchronize pool configuration to disk. This must be called with the
208 * namespace lock held.
209 */
210void
211spa_config_sync(spa_t *target, boolean_t removing, boolean_t postsysevent)
212{
213 spa_config_dirent_t *dp, *tdp;
214 nvlist_t *nvl;
215
216 ASSERT(MUTEX_HELD(&spa_namespace_lock));
217
218 /*
219 * Iterate over all cachefiles for the pool, past or present. When the
220 * cachefile is changed, the new one is pushed onto this list, allowing
221 * us to update previous cachefiles that no longer contain this pool.
222 */
223 for (dp = list_head(&target->spa_config_list); dp != NULL;
224 dp = list_next(&target->spa_config_list, dp)) {
225 spa_t *spa = NULL;
226 if (dp->scd_path == NULL)
227 continue;
228
229 /*
230 * Iterate over all pools, adding any matching pools to 'nvl'.
231 */
232 nvl = NULL;
233 while ((spa = spa_next(spa)) != NULL) {
234 if (spa == target && removing)
235 continue;
236
237 mutex_enter(&spa->spa_props_lock);
238 tdp = list_head(&spa->spa_config_list);
239 if (spa->spa_config == NULL ||
240 tdp->scd_path == NULL ||
241 strcmp(tdp->scd_path, dp->scd_path) != 0) {
242 mutex_exit(&spa->spa_props_lock);
243 continue;
244 }
245
246 if (nvl == NULL)
247 VERIFY(nvlist_alloc(&nvl, NV_UNIQUE_NAME,
248 KM_SLEEP) == 0);
249
250 VERIFY(nvlist_add_nvlist(nvl, spa->spa_name,
251 spa->spa_config) == 0);
252 mutex_exit(&spa->spa_props_lock);
253 }
254
255 spa_config_write(dp, nvl);
256 nvlist_free(nvl);
211 }
212
257 }
258
213 (void) VOP_CLOSE(vp, oflags, 1, 0, kcred);
214 VN_RELE(vp);
259 /*
260 * Remove any config entries older than the current one.
261 */
262 dp = list_head(&target->spa_config_list);
263 while ((tdp = list_next(&target->spa_config_list, dp)) != NULL) {
264 list_remove(&target->spa_config_list, tdp);
265 if (tdp->scd_path != NULL)
266 spa_strfree(tdp->scd_path);
267 kmem_free(tdp, sizeof (spa_config_dirent_t));
268 }
215
269
216out:
217 (void) vn_remove(pathname, UIO_SYSSPACE, RMFILE);
218 spa_config_generation++;
219
270 spa_config_generation++;
271
220 kmem_free(buf, buflen);
221 nvlist_free(config);
272 if (postsysevent)
273 spa_event_notify(target, NULL, ESC_ZFS_CONFIG_SYNC);
222}
223
224/*
225 * Sigh. Inside a local zone, we don't have access to /etc/zfs/zpool.cache,
226 * and we don't want to allow the local zone to see all the pools anyway.
227 * So we have to invent the ZFS_IOC_CONFIG ioctl to grab the configuration
228 * information for all pool visible within the zone.
229 */
230nvlist_t *
231spa_all_configs(uint64_t *generation)
232{
233 nvlist_t *pools;
274}
275
276/*
277 * Sigh. Inside a local zone, we don't have access to /etc/zfs/zpool.cache,
278 * and we don't want to allow the local zone to see all the pools anyway.
279 * So we have to invent the ZFS_IOC_CONFIG ioctl to grab the configuration
280 * information for all pool visible within the zone.
281 */
282nvlist_t *
283spa_all_configs(uint64_t *generation)
284{
285 nvlist_t *pools;
234 spa_t *spa;
286 spa_t *spa = NULL;
235
236 if (*generation == spa_config_generation)
237 return (NULL);
238
239 VERIFY(nvlist_alloc(&pools, NV_UNIQUE_NAME, KM_SLEEP) == 0);
240
287
288 if (*generation == spa_config_generation)
289 return (NULL);
290
291 VERIFY(nvlist_alloc(&pools, NV_UNIQUE_NAME, KM_SLEEP) == 0);
292
241 spa = NULL;
242 mutex_enter(&spa_namespace_lock);
243 while ((spa = spa_next(spa)) != NULL) {
293 mutex_enter(&spa_namespace_lock);
294 while ((spa = spa_next(spa)) != NULL) {
244 if (INGLOBALZONE(curproc) ||
295 if (INGLOBALZONE(curthread) ||
245 zone_dataset_visible(spa_name(spa), NULL)) {
296 zone_dataset_visible(spa_name(spa), NULL)) {
246 mutex_enter(&spa->spa_config_cache_lock);
297 mutex_enter(&spa->spa_props_lock);
247 VERIFY(nvlist_add_nvlist(pools, spa_name(spa),
248 spa->spa_config) == 0);
298 VERIFY(nvlist_add_nvlist(pools, spa_name(spa),
299 spa->spa_config) == 0);
249 mutex_exit(&spa->spa_config_cache_lock);
300 mutex_exit(&spa->spa_props_lock);
250 }
251 }
301 }
302 }
303 *generation = spa_config_generation;
252 mutex_exit(&spa_namespace_lock);
253
304 mutex_exit(&spa_namespace_lock);
305
254 *generation = spa_config_generation;
255
256 return (pools);
257}
258
259void
260spa_config_set(spa_t *spa, nvlist_t *config)
261{
306 return (pools);
307}
308
309void
310spa_config_set(spa_t *spa, nvlist_t *config)
311{
262 mutex_enter(&spa->spa_config_cache_lock);
312 mutex_enter(&spa->spa_props_lock);
263 if (spa->spa_config != NULL)
264 nvlist_free(spa->spa_config);
265 spa->spa_config = config;
313 if (spa->spa_config != NULL)
314 nvlist_free(spa->spa_config);
315 spa->spa_config = config;
266 mutex_exit(&spa->spa_config_cache_lock);
316 mutex_exit(&spa->spa_props_lock);
267}
268
269/*
270 * Generate the pool's configuration based on the current in-core state.
271 * We infer whether to generate a complete config or just one top-level config
272 * based on whether vd is the root vdev.
273 */
274nvlist_t *
275spa_config_generate(spa_t *spa, vdev_t *vd, uint64_t txg, int getstats)
276{
277 nvlist_t *config, *nvroot;
278 vdev_t *rvd = spa->spa_root_vdev;
279 unsigned long hostid = 0;
317}
318
319/*
320 * Generate the pool's configuration based on the current in-core state.
321 * We infer whether to generate a complete config or just one top-level config
322 * based on whether vd is the root vdev.
323 */
324nvlist_t *
325spa_config_generate(spa_t *spa, vdev_t *vd, uint64_t txg, int getstats)
326{
327 nvlist_t *config, *nvroot;
328 vdev_t *rvd = spa->spa_root_vdev;
329 unsigned long hostid = 0;
330 boolean_t locked = B_FALSE;
280
331
281 ASSERT(spa_config_held(spa, RW_READER));
282
283 if (vd == NULL)
332 if (vd == NULL) {
284 vd = rvd;
333 vd = rvd;
334 locked = B_TRUE;
335 spa_config_enter(spa, SCL_CONFIG | SCL_STATE, FTAG, RW_READER);
336 }
285
337
338 ASSERT(spa_config_held(spa, SCL_CONFIG | SCL_STATE, RW_READER) ==
339 (SCL_CONFIG | SCL_STATE));
340
286 /*
287 * If txg is -1, report the current value of spa->spa_config_txg.
288 */
289 if (txg == -1ULL)
290 txg = spa->spa_config_txg;
291
292 VERIFY(nvlist_alloc(&config, NV_UNIQUE_NAME, KM_SLEEP) == 0);
293
294 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_VERSION,
295 spa_version(spa)) == 0);
296 VERIFY(nvlist_add_string(config, ZPOOL_CONFIG_POOL_NAME,
297 spa_name(spa)) == 0);
298 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_POOL_STATE,
299 spa_state(spa)) == 0);
300 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_POOL_TXG,
301 txg) == 0);
302 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_POOL_GUID,
303 spa_guid(spa)) == 0);
304 (void) ddi_strtoul(hw_serial, NULL, 10, &hostid);
341 /*
342 * If txg is -1, report the current value of spa->spa_config_txg.
343 */
344 if (txg == -1ULL)
345 txg = spa->spa_config_txg;
346
347 VERIFY(nvlist_alloc(&config, NV_UNIQUE_NAME, KM_SLEEP) == 0);
348
349 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_VERSION,
350 spa_version(spa)) == 0);
351 VERIFY(nvlist_add_string(config, ZPOOL_CONFIG_POOL_NAME,
352 spa_name(spa)) == 0);
353 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_POOL_STATE,
354 spa_state(spa)) == 0);
355 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_POOL_TXG,
356 txg) == 0);
357 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_POOL_GUID,
358 spa_guid(spa)) == 0);
359 (void) ddi_strtoul(hw_serial, NULL, 10, &hostid);
305 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_HOSTID,
306 hostid) == 0);
360 if (hostid != 0) {
361 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_HOSTID,
362 hostid) == 0);
363 }
307 VERIFY(nvlist_add_string(config, ZPOOL_CONFIG_HOSTNAME,
308 utsname.nodename) == 0);
309
310 if (vd != rvd) {
311 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_TOP_GUID,
312 vd->vdev_top->vdev_guid) == 0);
313 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_GUID,
314 vd->vdev_guid) == 0);
315 if (vd->vdev_isspare)
316 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_IS_SPARE,
317 1ULL) == 0);
364 VERIFY(nvlist_add_string(config, ZPOOL_CONFIG_HOSTNAME,
365 utsname.nodename) == 0);
366
367 if (vd != rvd) {
368 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_TOP_GUID,
369 vd->vdev_top->vdev_guid) == 0);
370 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_GUID,
371 vd->vdev_guid) == 0);
372 if (vd->vdev_isspare)
373 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_IS_SPARE,
374 1ULL) == 0);
375 if (vd->vdev_islog)
376 VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_IS_LOG,
377 1ULL) == 0);
318 vd = vd->vdev_top; /* label contains top config */
319 }
320
378 vd = vd->vdev_top; /* label contains top config */
379 }
380
321 nvroot = vdev_config_generate(spa, vd, getstats, B_FALSE);
381 nvroot = vdev_config_generate(spa, vd, getstats, B_FALSE, B_FALSE);
322 VERIFY(nvlist_add_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, nvroot) == 0);
323 nvlist_free(nvroot);
324
382 VERIFY(nvlist_add_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, nvroot) == 0);
383 nvlist_free(nvroot);
384
385 if (locked)
386 spa_config_exit(spa, SCL_CONFIG | SCL_STATE, FTAG);
387
325 return (config);
326}
327
328/*
388 return (config);
389}
390
391/*
329 * Update all disk labels, generate a fresh config based on the current
330 * in-core state, and sync the global config cache.
392 * For a pool that's not currently a booting rootpool, update all disk labels,
393 * generate a fresh config based on the current in-core state, and sync the
394 * global config cache.
331 */
332void
333spa_config_update(spa_t *spa, int what)
334{
395 */
396void
397spa_config_update(spa_t *spa, int what)
398{
399 spa_config_update_common(spa, what, FALSE);
400}
401
402/*
403 * Update all disk labels, generate a fresh config based on the current
404 * in-core state, and sync the global config cache (do not sync the config
405 * cache if this is a booting rootpool).
406 */
407void
408spa_config_update_common(spa_t *spa, int what, boolean_t isroot)
409{
335 vdev_t *rvd = spa->spa_root_vdev;
336 uint64_t txg;
337 int c;
338
339 ASSERT(MUTEX_HELD(&spa_namespace_lock));
340
410 vdev_t *rvd = spa->spa_root_vdev;
411 uint64_t txg;
412 int c;
413
414 ASSERT(MUTEX_HELD(&spa_namespace_lock));
415
341 spa_config_enter(spa, RW_WRITER, FTAG);
416 spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
342 txg = spa_last_synced_txg(spa) + 1;
343 if (what == SPA_CONFIG_UPDATE_POOL) {
344 vdev_config_dirty(rvd);
345 } else {
346 /*
347 * If we have top-level vdevs that were added but have
348 * not yet been prepared for allocation, do that now.
349 * (It's safe now because the config cache is up to date,
350 * so it will be able to translate the new DVAs.)
351 * See comments in spa_vdev_add() for full details.
352 */
353 for (c = 0; c < rvd->vdev_children; c++) {
354 vdev_t *tvd = rvd->vdev_child[c];
355 if (tvd->vdev_ms_array == 0) {
356 vdev_init(tvd, txg);
357 vdev_config_dirty(tvd);
358 }
359 }
360 }
417 txg = spa_last_synced_txg(spa) + 1;
418 if (what == SPA_CONFIG_UPDATE_POOL) {
419 vdev_config_dirty(rvd);
420 } else {
421 /*
422 * If we have top-level vdevs that were added but have
423 * not yet been prepared for allocation, do that now.
424 * (It's safe now because the config cache is up to date,
425 * so it will be able to translate the new DVAs.)
426 * See comments in spa_vdev_add() for full details.
427 */
428 for (c = 0; c < rvd->vdev_children; c++) {
429 vdev_t *tvd = rvd->vdev_child[c];
430 if (tvd->vdev_ms_array == 0) {
431 vdev_init(tvd, txg);
432 vdev_config_dirty(tvd);
433 }
434 }
435 }
361 spa_config_exit(spa, FTAG);
436 spa_config_exit(spa, SCL_ALL, FTAG);
362
363 /*
364 * Wait for the mosconfig to be regenerated and synced.
365 */
366 txg_wait_synced(spa->spa_dsl_pool, txg);
367
368 /*
369 * Update the global config cache to reflect the new mosconfig.
370 */
437
438 /*
439 * Wait for the mosconfig to be regenerated and synced.
440 */
441 txg_wait_synced(spa->spa_dsl_pool, txg);
442
443 /*
444 * Update the global config cache to reflect the new mosconfig.
445 */
371 spa_config_sync();
446 if (!isroot)
447 spa_config_sync(spa, B_FALSE, what != SPA_CONFIG_UPDATE_POOL);
372
373 if (what == SPA_CONFIG_UPDATE_POOL)
448
449 if (what == SPA_CONFIG_UPDATE_POOL)
374 spa_config_update(spa, SPA_CONFIG_UPDATE_VDEVS);
450 spa_config_update_common(spa, SPA_CONFIG_UPDATE_VDEVS, isroot);
375}
451}