Deleted Added
full compact
libzfs_import.c (332536) libzfs_import.c (332550)
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

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

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 (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
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

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

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 (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
24 * Copyright (c) 2012, 2016 by Delphix. All rights reserved.
24 * Copyright (c) 2012, 2017 by Delphix. All rights reserved.
25 * Copyright 2015 RackTop Systems.
26 * Copyright 2016 Nexenta Systems, Inc.
27 */
28
29/*
30 * Pool import support functions.
31 *
32 * To import a pool, we rely on reading the configuration information from the

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

771
772 if (isactive) {
773 nvlist_free(config);
774 config = NULL;
775 continue;
776 }
777
778 if (policy != NULL) {
25 * Copyright 2015 RackTop Systems.
26 * Copyright 2016 Nexenta Systems, Inc.
27 */
28
29/*
30 * Pool import support functions.
31 *
32 * To import a pool, we rely on reading the configuration information from the

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

771
772 if (isactive) {
773 nvlist_free(config);
774 config = NULL;
775 continue;
776 }
777
778 if (policy != NULL) {
779 if (nvlist_add_nvlist(config, ZPOOL_REWIND_POLICY,
779 if (nvlist_add_nvlist(config, ZPOOL_LOAD_POLICY,
780 policy) != 0)
781 goto nomem;
782 }
783
784 if ((nvl = refresh_config(hdl, config)) == NULL) {
785 nvlist_free(config);
786 config = NULL;
787 continue;

--- 1067 unchanged lines hidden ---
780 policy) != 0)
781 goto nomem;
782 }
783
784 if ((nvl = refresh_config(hdl, config)) == NULL) {
785 nvlist_free(config);
786 config = NULL;
787 continue;

--- 1067 unchanged lines hidden ---