Deleted Added
sdiff udiff text old ( 240868 ) new ( 241286 )
full compact
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

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

3545
3546 spa->spa_minref = refcount_count(&spa->spa_refcount);
3547
3548 mutex_exit(&spa_namespace_lock);
3549
3550 return (0);
3551}
3552
3553#if defined(sun)
3554#ifdef _KERNEL
3555/*
3556 * Get the root pool information from the root disk, then import the root pool
3557 * during the system boot up time.
3558 */
3559extern int vdev_disk_read_rootlabel(char *, char *, nvlist_t **);
3560
3561static nvlist_t *
3562spa_generate_rootconf(char *devpath, char *devid, uint64_t *guid)

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

3748 vdev_free(rvd);
3749 spa_config_exit(spa, SCL_ALL, FTAG);
3750 mutex_exit(&spa_namespace_lock);
3751
3752 nvlist_free(config);
3753 return (error);
3754}
3755
3756#endif
3757#endif /* sun */
3758
3759/*
3760 * Import a non-root pool into the system.
3761 */
3762int
3763spa_import(const char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags)
3764{
3765 spa_t *spa;

--- 2677 unchanged lines hidden ---