diff options
| author | Stephen Hemminger <stephen@networkplumber.org> | 2014-04-07 18:38:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 19:36:07 -0400 |
| commit | 90ae3ae539246984d36e43b0e23554bca941476f (patch) | |
| tree | 9bd2b02cca89ce927249b5dbe6fcf5bebd1e3b87 /lib | |
| parent | c4082f36fa3eeb5d4fadc50241b6e3a388561f80 (diff) | |
idr: remove dead code
Remove no longer used deprecated code, and make local functions
static.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Jean Delvare <jdelvare@suse.de>
Acked-by: Tejun Heo <tj@kernel.org>
Cc: Jeff Layton <jlayton@redhat.com>
Cc: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: George Spelvin <linux@horizon.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/idr.c | 20 |
1 files changed, 2 insertions, 18 deletions
| @@ -196,7 +196,7 @@ static void idr_mark_full(struct idr_layer **pa, int id) | |||
| 196 | } | 196 | } |
| 197 | } | 197 | } |
| 198 | 198 | ||
| 199 | int __idr_pre_get(struct idr *idp, gfp_t gfp_mask) | 199 | static int __idr_pre_get(struct idr *idp, gfp_t gfp_mask) |
| 200 | { | 200 | { |
| 201 | while (idp->id_free_cnt < MAX_IDR_FREE) { | 201 | while (idp->id_free_cnt < MAX_IDR_FREE) { |
| 202 | struct idr_layer *new; | 202 | struct idr_layer *new; |
| @@ -207,7 +207,6 @@ int __idr_pre_get(struct idr *idp, gfp_t gfp_mask) | |||
| 207 | } | 207 | } |
| 208 | return 1; | 208 | return 1; |
| 209 | } | 209 | } |
| 210 | EXPORT_SYMBOL(__idr_pre_get); | ||
| 211 | 210 | ||
| 212 | /** | 211 | /** |
| 213 | * sub_alloc - try to allocate an id without growing the tree depth | 212 | * sub_alloc - try to allocate an id without growing the tree depth |
| @@ -374,20 +373,6 @@ static void idr_fill_slot(struct idr *idr, void *ptr, int id, | |||
| 374 | idr_mark_full(pa, id); | 373 | idr_mark_full(pa, id); |
| 375 | } | 374 | } |
| 376 | 375 | ||
| 377 | int __idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id) | ||
| 378 | { | ||
| 379 | struct idr_layer *pa[MAX_IDR_LEVEL + 1]; | ||
| 380 | int rv; | ||
| 381 | |||
| 382 | rv = idr_get_empty_slot(idp, starting_id, pa, 0, idp); | ||
| 383 | if (rv < 0) | ||
| 384 | return rv == -ENOMEM ? -EAGAIN : rv; | ||
| 385 | |||
| 386 | idr_fill_slot(idp, ptr, rv, pa); | ||
| 387 | *id = rv; | ||
| 388 | return 0; | ||
| 389 | } | ||
| 390 | EXPORT_SYMBOL(__idr_get_new_above); | ||
| 391 | 376 | ||
| 392 | /** | 377 | /** |
| 393 | * idr_preload - preload for idr_alloc() | 378 | * idr_preload - preload for idr_alloc() |
| @@ -607,7 +592,7 @@ void idr_remove(struct idr *idp, int id) | |||
| 607 | } | 592 | } |
| 608 | EXPORT_SYMBOL(idr_remove); | 593 | EXPORT_SYMBOL(idr_remove); |
| 609 | 594 | ||
| 610 | void __idr_remove_all(struct idr *idp) | 595 | static void __idr_remove_all(struct idr *idp) |
| 611 | { | 596 | { |
| 612 | int n, id, max; | 597 | int n, id, max; |
| 613 | int bt_mask; | 598 | int bt_mask; |
| @@ -640,7 +625,6 @@ void __idr_remove_all(struct idr *idp) | |||
| 640 | } | 625 | } |
| 641 | idp->layers = 0; | 626 | idp->layers = 0; |
| 642 | } | 627 | } |
| 643 | EXPORT_SYMBOL(__idr_remove_all); | ||
| 644 | 628 | ||
| 645 | /** | 629 | /** |
| 646 | * idr_destroy - release all cached layers within an idr tree | 630 | * idr_destroy - release all cached layers within an idr tree |