Skip to content

Commit b03f8e4

Browse files
author
Matthew Wilcox
committed
ida: Remove old API
Delete ida_pre_get(), ida_get_new(), ida_get_new_above() and ida_remove() from the public API. Some of these functions still exist as internal helpers, but they should not be called by consumers. Signed-off-by: Matthew Wilcox <willy@infradead.org>
1 parent f272668 commit b03f8e4

File tree

3 files changed

+11
-67
lines changed

3 files changed

+11
-67
lines changed

‎include/linux/idr.h

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,9 @@ struct ida {
225225
}
226226
#define DEFINE_IDA(name) struct ida name = IDA_INIT(name)
227227

228-
int ida_pre_get(struct ida *ida, gfp_t gfp_mask);
229-
int ida_get_new_above(struct ida *ida, int starting_id, int *p_id);
230-
void ida_remove(struct ida *ida, int id);
231-
void ida_destroy(struct ida *ida);
232-
233228
int ida_alloc_range(struct ida *, unsigned int min, unsigned int max, gfp_t);
234229
void ida_free(struct ida *, unsigned int id);
230+
void ida_destroy(struct ida *ida);
235231

236232
/**
237233
* ida_alloc() - Allocate an unused ID.
@@ -292,20 +288,11 @@ static inline void ida_init(struct ida *ida)
292288
ida_alloc_range(ida, start, (end) - 1, gfp)
293289
#define ida_simple_remove(ida, id) ida_free(ida, id)
294290

295-
/**
296-
* ida_get_new - allocate new ID
297-
* @ida: idr handle
298-
* @p_id: pointer to the allocated handle
299-
*
300-
* Simple wrapper around ida_get_new_above() w/ @starting_id of zero.
301-
*/
302-
static inline int ida_get_new(struct ida *ida, int *p_id)
303-
{
304-
return ida_get_new_above(ida, 0, p_id);
305-
}
306-
307291
static inline bool ida_is_empty(const struct ida *ida)
308292
{
309293
return radix_tree_empty(&ida->ida_rt);
310294
}
295+
296+
/* in lib/radix-tree.c */
297+
int ida_pre_get(struct ida *ida, gfp_t gfp_mask);
311298
#endif /* __IDR_H__ */

‎lib/idr.c

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -320,16 +320,9 @@ EXPORT_SYMBOL(idr_replace);
320320
* ida_alloc(), ida_alloc_min(), ida_alloc_max() or ida_alloc_range().
321321
* To free an ID, call ida_free().
322322
*
323-
* If you have more complex locking requirements, use a loop around
324-
* ida_pre_get() and ida_get_new() to allocate a new ID. Then use
325-
* ida_remove() to free an ID. You must make sure that ida_get_new() and
326-
* ida_remove() cannot be called at the same time as each other for the
327-
* same IDA.
328-
*
329-
* You can also use ida_get_new_above() if you need an ID to be allocated
330-
* above a particular number. ida_destroy() can be used to dispose of an
331-
* IDA without needing to free the individual IDs in it. You can use
332-
* ida_is_empty() to find out whether the IDA has any IDs currently allocated.
323+
* ida_destroy() can be used to dispose of an IDA without needing to
324+
* free the individual IDs in it. You can use ida_is_empty() to find
325+
* out whether the IDA has any IDs currently allocated.
333326
*
334327
* IDs are currently limited to the range [0-INT_MAX]. If this is an awkward
335328
* limitation, it should be quite straightforward to raise the maximum.
@@ -370,25 +363,7 @@ EXPORT_SYMBOL(idr_replace);
370363

371364
#define IDA_MAX (0x80000000U / IDA_BITMAP_BITS - 1)
372365

373-
/**
374-
* ida_get_new_above - allocate new ID above or equal to a start id
375-
* @ida: ida handle
376-
* @start: id to start search at
377-
* @id: pointer to the allocated handle
378-
*
379-
* Allocate new ID above or equal to @start. It should be called
380-
* with any required locks to ensure that concurrent calls to
381-
* ida_get_new_above() / ida_get_new() / ida_remove() are not allowed.
382-
* Consider using ida_alloc_range() if you do not have complex locking
383-
* requirements.
384-
*
385-
* If memory is required, it will return %-EAGAIN, you should unlock
386-
* and go back to the ida_pre_get() call. If the ida is full, it will
387-
* return %-ENOSPC. On success, it will return 0.
388-
*
389-
* @id returns a value in the range @start ... %0x7fffffff.
390-
*/
391-
int ida_get_new_above(struct ida *ida, int start, int *id)
366+
static int ida_get_new_above(struct ida *ida, int start, int *id)
392367
{
393368
struct radix_tree_root *root = &ida->ida_rt;
394369
void __rcu **slot;
@@ -473,16 +448,8 @@ int ida_get_new_above(struct ida *ida, int start, int *id)
473448
return 0;
474449
}
475450
}
476-
EXPORT_SYMBOL(ida_get_new_above);
477451

478-
/**
479-
* ida_remove - Free the given ID
480-
* @ida: ida handle
481-
* @id: ID to free
482-
*
483-
* This function should not be called at the same time as ida_get_new_above().
484-
*/
485-
void ida_remove(struct ida *ida, int id)
452+
static void ida_remove(struct ida *ida, int id)
486453
{
487454
unsigned long index = id / IDA_BITMAP_BITS;
488455
unsigned offset = id % IDA_BITMAP_BITS;
@@ -519,9 +486,8 @@ void ida_remove(struct ida *ida, int id)
519486
}
520487
return;
521488
err:
522-
WARN(1, "ida_remove called for id=%d which is not allocated.\n", id);
489+
WARN(1, "ida_free called for id=%d which is not allocated.\n", id);
523490
}
524-
EXPORT_SYMBOL(ida_remove);
525491

526492
/**
527493
* ida_destroy() - Free all IDs.
@@ -568,7 +534,7 @@ EXPORT_SYMBOL(ida_destroy);
568534
int ida_alloc_range(struct ida *ida, unsigned int min, unsigned int max,
569535
gfp_t gfp)
570536
{
571-
int ret, id;
537+
int ret, id = 0;
572538
unsigned long flags;
573539

574540
if ((int)min < 0)

‎lib/radix-tree.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2106,14 +2106,6 @@ void idr_preload(gfp_t gfp_mask)
21062106
}
21072107
EXPORT_SYMBOL(idr_preload);
21082108

2109-
/**
2110-
* ida_pre_get - reserve resources for ida allocation
2111-
* @ida: ida handle
2112-
* @gfp: memory allocation flags
2113-
*
2114-
* This function should be called before calling ida_get_new_above(). If it
2115-
* is unable to allocate memory, it will return %0. On success, it returns %1.
2116-
*/
21172109
int ida_pre_get(struct ida *ida, gfp_t gfp)
21182110
{
21192111
/*
@@ -2134,7 +2126,6 @@ int ida_pre_get(struct ida *ida, gfp_t gfp)
21342126

21352127
return 1;
21362128
}
2137-
EXPORT_SYMBOL(ida_pre_get);
21382129

21392130
void __rcu **idr_get_free(struct radix_tree_root *root,
21402131
struct radix_tree_iter *iter, gfp_t gfp,

0 commit comments

Comments
 (0)