UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Tejun Heo 2013-02-27 17:03:50 -08:00 committed by Linus Torvalds
parent c897ff68be
commit fe6e24ec90
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/linux/idr.h
View File

@ -110,10 +110,22 @@ int idr_for_each(struct idr *idp,
void *idr_get_next(struct idr *idp, int *nextid); void *idr_get_next(struct idr *idp, int *nextid);
void *idr_replace(struct idr *idp, void *ptr, int id); void *idr_replace(struct idr *idp, void *ptr, int id);
void idr_remove(struct idr *idp, int id); void idr_remove(struct idr *idp, int id);
void idr_remove_all(struct idr *idp);
void idr_destroy(struct idr *idp); void idr_destroy(struct idr *idp);
void idr_init(struct idr *idp); void idr_init(struct idr *idp);
void __idr_remove_all(struct idr *idp); /* don't use */
/**
* idr_remove_all - remove all ids from the given idr tree
* @idp: idr handle
*
* If you're trying to destroy @idp, calling idr_destroy() is enough.
* This is going away. Don't use.
*/
static inline void __deprecated idr_remove_all(struct idr *idp)
{
__idr_remove_all(idp);
}
/* /*
* IDA - IDR based id allocator, use when translation from id to * IDA - IDR based id allocator, use when translation from id to

10
lib/idr.c
View File

@ -433,11 +433,7 @@ void idr_remove(struct idr *idp, int id)
} }
EXPORT_SYMBOL(idr_remove); EXPORT_SYMBOL(idr_remove);
/** void __idr_remove_all(struct idr *idp)
* idr_remove_all - remove all ids from the given idr tree
* @idp: idr handle
*/
void idr_remove_all(struct idr *idp)
{ {
int n, id, max; int n, id, max;
int bt_mask; int bt_mask;
@ -470,7 +466,7 @@ void idr_remove_all(struct idr *idp)
} }
idp->layers = 0; idp->layers = 0;
} }
EXPORT_SYMBOL(idr_remove_all); EXPORT_SYMBOL(__idr_remove_all);
/** /**
* idr_destroy - release all cached layers within an idr tree * idr_destroy - release all cached layers within an idr tree
@ -487,7 +483,7 @@ EXPORT_SYMBOL(idr_remove_all);
*/ */
void idr_destroy(struct idr *idp) void idr_destroy(struct idr *idp)
{ {
idr_remove_all(idp); __idr_remove_all(idp);
while (idp->id_free_cnt) { while (idp->id_free_cnt) {
struct idr_layer *p = get_from_free_list(idp); struct idr_layer *p = get_from_free_list(idp);