diff options
| author | Tejun Heo <tj@kernel.org> | 2013-02-27 20:03:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 22:10:14 -0500 |
| commit | fe6e24ec90b753392c3f9ec1fbca196c4e88e511 (patch) | |
| tree | 6eb4f3e981bfa583e30bf7898342d88031130ffe /include/linux | |
| parent | c897ff68beec97768c31f9de97de93f77ff2d87e (diff) | |
idr: deprecate idr_remove_all()
There was only one legitimate use of idr_remove_all() and a lot more of
incorrect uses (or lack of it). Now that idr_destroy() implies
idr_remove_all() and all the in-kernel users updated not to use it,
there's no reason to keep it around. Mark it deprecated so that we can
later unexport it.
idr_remove_all() is made an inline function calling __idr_remove_all()
to avoid triggering deprecated warning on EXPORT_SYMBOL().
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/idr.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/include/linux/idr.h b/include/linux/idr.h index e5eb125effe6..4cf042da3892 100644 --- a/include/linux/idr.h +++ b/include/linux/idr.h | |||
| @@ -110,10 +110,22 @@ int idr_for_each(struct idr *idp, | |||
| 110 | void *idr_get_next(struct idr *idp, int *nextid); | 110 | void *idr_get_next(struct idr *idp, int *nextid); |
| 111 | void *idr_replace(struct idr *idp, void *ptr, int id); | 111 | void *idr_replace(struct idr *idp, void *ptr, int id); |
| 112 | void idr_remove(struct idr *idp, int id); | 112 | void idr_remove(struct idr *idp, int id); |
| 113 | void idr_remove_all(struct idr *idp); | ||
| 114 | void idr_destroy(struct idr *idp); | 113 | void idr_destroy(struct idr *idp); |
| 115 | void idr_init(struct idr *idp); | 114 | void idr_init(struct idr *idp); |
| 116 | 115 | ||
| 116 | void __idr_remove_all(struct idr *idp); /* don't use */ | ||
| 117 | |||
| 118 | /** | ||
| 119 | * idr_remove_all - remove all ids from the given idr tree | ||
| 120 | * @idp: idr handle | ||
| 121 | * | ||
| 122 | * If you're trying to destroy @idp, calling idr_destroy() is enough. | ||
| 123 | * This is going away. Don't use. | ||
| 124 | */ | ||
| 125 | static inline void __deprecated idr_remove_all(struct idr *idp) | ||
| 126 | { | ||
| 127 | __idr_remove_all(idp); | ||
| 128 | } | ||
| 117 | 129 | ||
| 118 | /* | 130 | /* |
| 119 | * IDA - IDR based id allocator, use when translation from id to | 131 | * IDA - IDR based id allocator, use when translation from id to |
