diff options
-rw-r--r-- | fs/configfs/item.c | 15 | ||||
-rw-r--r-- | include/linux/configfs.h | 1 |
2 files changed, 3 insertions, 13 deletions
diff --git a/fs/configfs/item.c b/fs/configfs/item.c index 24421209f854..b762bbeaa0be 100644 --- a/fs/configfs/item.c +++ b/fs/configfs/item.c | |||
@@ -62,7 +62,6 @@ void config_item_init(struct config_item * item) | |||
62 | * dynamically allocated string that @item->ci_name points to. | 62 | * dynamically allocated string that @item->ci_name points to. |
63 | * Otherwise, use the static @item->ci_namebuf array. | 63 | * Otherwise, use the static @item->ci_namebuf array. |
64 | */ | 64 | */ |
65 | |||
66 | int config_item_set_name(struct config_item * item, const char * fmt, ...) | 65 | int config_item_set_name(struct config_item * item, const char * fmt, ...) |
67 | { | 66 | { |
68 | int error = 0; | 67 | int error = 0; |
@@ -139,12 +138,7 @@ struct config_item * config_item_get(struct config_item * item) | |||
139 | return item; | 138 | return item; |
140 | } | 139 | } |
141 | 140 | ||
142 | /** | 141 | static void config_item_cleanup(struct config_item * item) |
143 | * config_item_cleanup - free config_item resources. | ||
144 | * @item: item. | ||
145 | */ | ||
146 | |||
147 | void config_item_cleanup(struct config_item * item) | ||
148 | { | 142 | { |
149 | struct config_item_type * t = item->ci_type; | 143 | struct config_item_type * t = item->ci_type; |
150 | struct config_group * s = item->ci_group; | 144 | struct config_group * s = item->ci_group; |
@@ -179,12 +173,10 @@ void config_item_put(struct config_item * item) | |||
179 | kref_put(&item->ci_kref, config_item_release); | 173 | kref_put(&item->ci_kref, config_item_release); |
180 | } | 174 | } |
181 | 175 | ||
182 | |||
183 | /** | 176 | /** |
184 | * config_group_init - initialize a group for use | 177 | * config_group_init - initialize a group for use |
185 | * @k: group | 178 | * @k: group |
186 | */ | 179 | */ |
187 | |||
188 | void config_group_init(struct config_group *group) | 180 | void config_group_init(struct config_group *group) |
189 | { | 181 | { |
190 | config_item_init(&group->cg_item); | 182 | config_item_init(&group->cg_item); |
@@ -201,8 +193,8 @@ void config_group_init(struct config_group *group) | |||
201 | * looking for a matching config_item. If matching item is found | 193 | * looking for a matching config_item. If matching item is found |
202 | * take a reference and return the item. | 194 | * take a reference and return the item. |
203 | */ | 195 | */ |
204 | 196 | struct config_item *config_group_find_obj(struct config_group *group, | |
205 | struct config_item * config_group_find_obj(struct config_group * group, const char * name) | 197 | const char * name) |
206 | { | 198 | { |
207 | struct list_head * entry; | 199 | struct list_head * entry; |
208 | struct config_item * ret = NULL; | 200 | struct config_item * ret = NULL; |
@@ -219,7 +211,6 @@ struct config_item * config_group_find_obj(struct config_group * group, const ch | |||
219 | return ret; | 211 | return ret; |
220 | } | 212 | } |
221 | 213 | ||
222 | |||
223 | EXPORT_SYMBOL(config_item_init); | 214 | EXPORT_SYMBOL(config_item_init); |
224 | EXPORT_SYMBOL(config_group_init); | 215 | EXPORT_SYMBOL(config_group_init); |
225 | EXPORT_SYMBOL(config_item_get); | 216 | EXPORT_SYMBOL(config_item_get); |
diff --git a/include/linux/configfs.h b/include/linux/configfs.h index fef6f3d0a4a7..3d4a96eb0e9b 100644 --- a/include/linux/configfs.h +++ b/include/linux/configfs.h | |||
@@ -75,7 +75,6 @@ extern void config_item_init(struct config_item *); | |||
75 | extern void config_item_init_type_name(struct config_item *item, | 75 | extern void config_item_init_type_name(struct config_item *item, |
76 | const char *name, | 76 | const char *name, |
77 | struct config_item_type *type); | 77 | struct config_item_type *type); |
78 | extern void config_item_cleanup(struct config_item *); | ||
79 | 78 | ||
80 | extern struct config_item * config_item_get(struct config_item *); | 79 | extern struct config_item * config_item_get(struct config_item *); |
81 | extern void config_item_put(struct config_item *); | 80 | extern void config_item_put(struct config_item *); |