diff options
Diffstat (limited to 'drivers/md/persistent-data/dm-space-map-disk.c')
-rw-r--r-- | drivers/md/persistent-data/dm-space-map-disk.c | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c index 3d0ed5332883..f6d29e614ab7 100644 --- a/drivers/md/persistent-data/dm-space-map-disk.c +++ b/drivers/md/persistent-data/dm-space-map-disk.c | |||
@@ -4,7 +4,6 @@ | |||
4 | * This file is released under the GPL. | 4 | * This file is released under the GPL. |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include "dm-space-map-checker.h" | ||
8 | #include "dm-space-map-common.h" | 7 | #include "dm-space-map-common.h" |
9 | #include "dm-space-map-disk.h" | 8 | #include "dm-space-map-disk.h" |
10 | #include "dm-space-map.h" | 9 | #include "dm-space-map.h" |
@@ -252,9 +251,8 @@ static struct dm_space_map ops = { | |||
252 | .copy_root = sm_disk_copy_root | 251 | .copy_root = sm_disk_copy_root |
253 | }; | 252 | }; |
254 | 253 | ||
255 | static struct dm_space_map *dm_sm_disk_create_real( | 254 | struct dm_space_map *dm_sm_disk_create(struct dm_transaction_manager *tm, |
256 | struct dm_transaction_manager *tm, | 255 | dm_block_t nr_blocks) |
257 | dm_block_t nr_blocks) | ||
258 | { | 256 | { |
259 | int r; | 257 | int r; |
260 | struct sm_disk *smd; | 258 | struct sm_disk *smd; |
@@ -285,27 +283,10 @@ bad: | |||
285 | kfree(smd); | 283 | kfree(smd); |
286 | return ERR_PTR(r); | 284 | return ERR_PTR(r); |
287 | } | 285 | } |
288 | |||
289 | struct dm_space_map *dm_sm_disk_create(struct dm_transaction_manager *tm, | ||
290 | dm_block_t nr_blocks) | ||
291 | { | ||
292 | struct dm_space_map *sm = dm_sm_disk_create_real(tm, nr_blocks); | ||
293 | struct dm_space_map *smc; | ||
294 | |||
295 | if (IS_ERR_OR_NULL(sm)) | ||
296 | return sm; | ||
297 | |||
298 | smc = dm_sm_checker_create_fresh(sm); | ||
299 | if (IS_ERR(smc)) | ||
300 | dm_sm_destroy(sm); | ||
301 | |||
302 | return smc; | ||
303 | } | ||
304 | EXPORT_SYMBOL_GPL(dm_sm_disk_create); | 286 | EXPORT_SYMBOL_GPL(dm_sm_disk_create); |
305 | 287 | ||
306 | static struct dm_space_map *dm_sm_disk_open_real( | 288 | struct dm_space_map *dm_sm_disk_open(struct dm_transaction_manager *tm, |
307 | struct dm_transaction_manager *tm, | 289 | void *root_le, size_t len) |
308 | void *root_le, size_t len) | ||
309 | { | 290 | { |
310 | int r; | 291 | int r; |
311 | struct sm_disk *smd; | 292 | struct sm_disk *smd; |
@@ -332,13 +313,6 @@ bad: | |||
332 | kfree(smd); | 313 | kfree(smd); |
333 | return ERR_PTR(r); | 314 | return ERR_PTR(r); |
334 | } | 315 | } |
335 | |||
336 | struct dm_space_map *dm_sm_disk_open(struct dm_transaction_manager *tm, | ||
337 | void *root_le, size_t len) | ||
338 | { | ||
339 | return dm_sm_checker_create( | ||
340 | dm_sm_disk_open_real(tm, root_le, len)); | ||
341 | } | ||
342 | EXPORT_SYMBOL_GPL(dm_sm_disk_open); | 316 | EXPORT_SYMBOL_GPL(dm_sm_disk_open); |
343 | 317 | ||
344 | /*----------------------------------------------------------------*/ | 318 | /*----------------------------------------------------------------*/ |