Print this page
4171 clean up spa_feature_*() interfaces
4172 implement extensible_dataset feature for use by other zpool features
Reviewed by: Max Grossman <max.grossman@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/common/zfs/zfeature_common.c
+++ new/usr/src/common/zfs/zfeature_common.c
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
11 11 * and limitations under the License.
12 12 *
13 13 * When distributing Covered Code, include this CDDL HEADER in each
14 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 * If applicable, add the following below this CDDL HEADER, with the
16 16 * fields enclosed by brackets "[]" replaced with your own identifying
17 17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 18 *
19 19 * CDDL HEADER END
20 20 */
21 21
22 22 /*
23 23 * Copyright (c) 2013 by Delphix. All rights reserved.
24 24 * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
25 25 * Copyright (c) 2013, Joyent, Inc. All rights reserved.
26 26 */
27 27
28 28 #ifdef _KERNEL
29 29 #include <sys/systm.h>
30 30 #else
31 31 #include <errno.h>
32 32 #include <string.h>
33 33 #endif
34 34 #include <sys/debug.h>
35 35 #include <sys/fs/zfs.h>
36 36 #include <sys/inttypes.h>
37 37 #include <sys/types.h>
38 38 #include "zfeature_common.h"
39 39
40 40 /*
41 41 * Set to disable all feature checks while opening pools, allowing pools with
42 42 * unsupported features to be opened. Set for testing only.
43 43 */
44 44 boolean_t zfeature_checks_disable = B_FALSE;
45 45
46 46 zfeature_info_t spa_feature_table[SPA_FEATURES];
47 47
48 48 /*
49 49 * Valid characters for feature guids. This list is mainly for aesthetic
50 50 * purposes and could be expanded in the future. There are different allowed
51 51 * characters in the guids reverse dns portion (before the colon) and its
52 52 * short name (after the colon).
53 53 */
54 54 static int
55 55 valid_char(char c, boolean_t after_colon)
56 56 {
57 57 return ((c >= 'a' && c <= 'z') ||
58 58 (c >= '0' && c <= '9') ||
59 59 c == (after_colon ? '_' : '.'));
60 60 }
61 61
62 62 /*
63 63 * Every feature guid must contain exactly one colon which separates a reverse
64 64 * dns organization name from the feature's "short" name (e.g.
65 65 * "com.company:feature_name").
66 66 */
67 67 boolean_t
68 68 zfeature_is_valid_guid(const char *name)
69 69 {
70 70 int i;
71 71 boolean_t has_colon = B_FALSE;
72 72
73 73 i = 0;
74 74 while (name[i] != '\0') {
75 75 char c = name[i++];
76 76 if (c == ':') {
77 77 if (has_colon)
78 78 return (B_FALSE);
79 79 has_colon = B_TRUE;
80 80 continue;
81 81 }
82 82 if (!valid_char(c, has_colon))
83 83 return (B_FALSE);
84 84 }
|
↓ open down ↓ |
84 lines elided |
↑ open up ↑ |
85 85
86 86 return (has_colon);
87 87 }
88 88
89 89 boolean_t
90 90 zfeature_is_supported(const char *guid)
91 91 {
92 92 if (zfeature_checks_disable)
93 93 return (B_TRUE);
94 94
95 - return (0 == zfeature_lookup_guid(guid, NULL));
96 -}
97 -
98 -int
99 -zfeature_lookup_guid(const char *guid, zfeature_info_t **res)
100 -{
101 - for (int i = 0; i < SPA_FEATURES; i++) {
95 + for (spa_feature_t i = 0; i < SPA_FEATURES; i++) {
102 96 zfeature_info_t *feature = &spa_feature_table[i];
103 - if (strcmp(guid, feature->fi_guid) == 0) {
104 - if (res != NULL)
105 - *res = feature;
106 - return (0);
107 - }
97 + if (strcmp(guid, feature->fi_guid) == 0)
98 + return (B_TRUE);
108 99 }
109 -
110 - return (ENOENT);
100 + return (B_FALSE);
111 101 }
112 102
113 103 int
114 -zfeature_lookup_name(const char *name, zfeature_info_t **res)
104 +zfeature_lookup_name(const char *name, spa_feature_t *res)
115 105 {
116 - for (int i = 0; i < SPA_FEATURES; i++) {
106 + for (spa_feature_t i = 0; i < SPA_FEATURES; i++) {
117 107 zfeature_info_t *feature = &spa_feature_table[i];
118 108 if (strcmp(name, feature->fi_uname) == 0) {
119 109 if (res != NULL)
120 - *res = feature;
110 + *res = i;
121 111 return (0);
122 112 }
123 113 }
124 114
125 115 return (ENOENT);
126 116 }
127 117
128 118 static void
129 -zfeature_register(int fid, const char *guid, const char *name, const char *desc,
130 - boolean_t readonly, boolean_t mos, zfeature_info_t **deps)
119 +zfeature_register(spa_feature_t fid, const char *guid, const char *name,
120 + const char *desc, boolean_t readonly, boolean_t mos,
121 + const spa_feature_t *deps)
131 122 {
132 123 zfeature_info_t *feature = &spa_feature_table[fid];
133 - static zfeature_info_t *nodeps[] = { NULL };
124 + static spa_feature_t nodeps[] = { SPA_FEATURE_NONE };
134 125
135 126 ASSERT(name != NULL);
136 127 ASSERT(desc != NULL);
137 128 ASSERT(!readonly || !mos);
138 129 ASSERT3U(fid, <, SPA_FEATURES);
139 130 ASSERT(zfeature_is_valid_guid(guid));
140 131
141 132 if (deps == NULL)
142 133 deps = nodeps;
143 134
135 + feature->fi_feature = fid;
144 136 feature->fi_guid = guid;
145 137 feature->fi_uname = name;
146 138 feature->fi_desc = desc;
147 139 feature->fi_can_readonly = readonly;
148 140 feature->fi_mos = mos;
149 141 feature->fi_depends = deps;
150 142 }
151 143
152 144 void
153 145 zpool_feature_init(void)
154 146 {
155 147 zfeature_register(SPA_FEATURE_ASYNC_DESTROY,
156 148 "com.delphix:async_destroy", "async_destroy",
157 149 "Destroy filesystems asynchronously.", B_TRUE, B_FALSE, NULL);
158 150 zfeature_register(SPA_FEATURE_EMPTY_BPOBJ,
159 151 "com.delphix:empty_bpobj", "empty_bpobj",
|
↓ open down ↓ |
6 lines elided |
↑ open up ↑ |
160 152 "Snapshots use less space.", B_TRUE, B_FALSE, NULL);
161 153 zfeature_register(SPA_FEATURE_LZ4_COMPRESS,
162 154 "org.illumos:lz4_compress", "lz4_compress",
163 155 "LZ4 compression algorithm support.", B_FALSE, B_FALSE, NULL);
164 156 zfeature_register(SPA_FEATURE_MULTI_VDEV_CRASH_DUMP,
165 157 "com.joyent:multi_vdev_crash_dump", "multi_vdev_crash_dump",
166 158 "Crash dumps to multiple vdev pools.", B_FALSE, B_FALSE, NULL);
167 159 zfeature_register(SPA_FEATURE_SPACEMAP_HISTOGRAM,
168 160 "com.delphix:spacemap_histogram", "spacemap_histogram",
169 161 "Spacemaps maintain space histograms.", B_TRUE, B_FALSE, NULL);
162 + zfeature_register(SPA_FEATURE_EXTENSIBLE_DATASET,
163 + "com.delphix:extensible_dataset", "extensible_dataset",
164 + "Enhanced dataset functionality, used by other features.",
165 + B_FALSE, B_FALSE, NULL);
170 166 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX