| zfs_comutil.c (219089) | zfs_comutil.c (248571) |
|---|---|
| 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 * Copyright (c) 2008, 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 --- 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 * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. |
| 23 * Copyright (c) 2012 by Delphix. All rights reserved. |
|
| 23 */ 24 25/* 26 * This file is intended for functions that ought to be common between user 27 * land (libzfs) and the kernel. When many common routines need to be shared 28 * then a separate file should to be created. 29 */ 30 --- 120 unchanged lines hidden (view full) --- 151 for (i = 0; zfs_version_table[i].version_zpl; i++) { 152 if (zfs_version_table[i].version_zpl >= zpl_version) 153 return (zfs_version_table[i].version_spa); 154 } 155 156 return (version); 157} 158 | 24 */ 25 26/* 27 * This file is intended for functions that ought to be common between user 28 * land (libzfs) and the kernel. When many common routines need to be shared 29 * then a separate file should to be created. 30 */ 31 --- 120 unchanged lines hidden (view full) --- 152 for (i = 0; zfs_version_table[i].version_zpl; i++) { 153 if (zfs_version_table[i].version_zpl >= zpl_version) 154 return (zfs_version_table[i].version_spa); 155 } 156 157 return (version); 158} 159 |
| 159const char *zfs_history_event_names[LOG_END] = { | 160/* 161 * This is the table of legacy internal event names; it should not be modified. 162 * The internal events are now stored in the history log as strings. 163 */ 164const char *zfs_history_event_names[ZFS_NUM_LEGACY_HISTORY_EVENTS] = { |
| 160 "invalid event", 161 "pool create", 162 "vdev add", 163 "pool remove", 164 "pool destroy", 165 "pool export", 166 "pool import", 167 "vdev attach", --- 34 unchanged lines hidden --- | 165 "invalid event", 166 "pool create", 167 "vdev add", 168 "pool remove", 169 "pool destroy", 170 "pool export", 171 "pool import", 172 "vdev attach", --- 34 unchanged lines hidden --- |