View | Details | Raw Unified | Return to bug 210721
Collapse All | Expand All

(-)b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c (+10 lines)
Lines 4485-4490 spa_import_rootpool(const char *name) Link Here
4485
4485
4486
		if ((spa = spa_lookup(pname)) != NULL) {
4486
		if ((spa = spa_lookup(pname)) != NULL) {
4487
			/*
4487
			/*
4488
			 * The pool could already be imported,
4489
			 * e.g., after reboot -r.
4490
			 */
4491
			if (spa->spa_state != POOL_STATE_UNINITIALIZED) {
4492
				mutex_exit(&spa_namespace_lock);
4493
				nvlist_free(config);
4494
				return (0);
4495
			}
4496
4497
			/*
4488
			 * Remove the existing root pool from the namespace so
4498
			 * Remove the existing root pool from the namespace so
4489
			 * that we can replace it with the correct config
4499
			 * that we can replace it with the correct config
4490
			 * we just read in.
4500
			 * we just read in.

Return to bug 210721