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

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

24 * Copyright (c) 2011, 2017 by Delphix. All rights reserved.
25 * Copyright (c) 2015, Nexenta Systems, Inc. All rights reserved.
26 * Copyright (c) 2013 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
27 * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved.
28 * Copyright 2013 Saso Kiselkov. All rights reserved.
29 * Copyright (c) 2014 Integros [integros.com]
30 * Copyright 2017 Joyent, Inc.
31 * Copyright (c) 2017 Datto Inc.
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

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

24 * Copyright (c) 2011, 2017 by Delphix. All rights reserved.
25 * Copyright (c) 2015, Nexenta Systems, Inc. All rights reserved.
26 * Copyright (c) 2013 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
27 * Copyright (c) 2014 Spectra Logic Corporation, All rights reserved.
28 * Copyright 2013 Saso Kiselkov. All rights reserved.
29 * Copyright (c) 2014 Integros [integros.com]
30 * Copyright 2017 Joyent, Inc.
31 * Copyright (c) 2017 Datto Inc.
32 * Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
32 */
33
34/*
35 * SPA: Storage Pool Allocator
36 *
37 * This file contains all the routines used when modifying on-disk SPA state.
38 * This includes opening, importing, destroying, exporting a pool, and syncing a
39 * pool.

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

4071 * can replace it with the correct config we just read in.
4072 */
4073 spa_remove(spa);
4074 }
4075
4076 spa = spa_add(pname, config, NULL);
4077 spa->spa_is_root = B_TRUE;
4078 spa->spa_import_flags = ZFS_IMPORT_VERBATIM;
33 */
34
35/*
36 * SPA: Storage Pool Allocator
37 *
38 * This file contains all the routines used when modifying on-disk SPA state.
39 * This includes opening, importing, destroying, exporting a pool, and syncing a
40 * pool.

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

4072 * can replace it with the correct config we just read in.
4073 */
4074 spa_remove(spa);
4075 }
4076
4077 spa = spa_add(pname, config, NULL);
4078 spa->spa_is_root = B_TRUE;
4079 spa->spa_import_flags = ZFS_IMPORT_VERBATIM;
4080 if (nvlist_lookup_uint64(config, ZPOOL_CONFIG_VERSION,
4081 &spa->spa_ubsync.ub_version) != 0)
4082 spa->spa_ubsync.ub_version = SPA_VERSION_INITIAL;
4079
4080 /*
4081 * Build up a vdev tree based on the boot device's label config.
4082 */
4083 VERIFY(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE,
4084 &nvtop) == 0);
4085 spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
4086 error = spa_config_parse(spa, &rvd, nvtop, NULL, 0,

--- 3326 unchanged lines hidden ---
4083
4084 /*
4085 * Build up a vdev tree based on the boot device's label config.
4086 */
4087 VERIFY(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE,
4088 &nvtop) == 0);
4089 spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
4090 error = spa_config_parse(spa, &rvd, nvtop, NULL, 0,

--- 3326 unchanged lines hidden ---