diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/idr.c | 49 |
1 files changed, 0 insertions, 49 deletions
@@ -317,36 +317,6 @@ int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id) | |||
317 | } | 317 | } |
318 | EXPORT_SYMBOL(idr_get_new_above); | 318 | EXPORT_SYMBOL(idr_get_new_above); |
319 | 319 | ||
320 | /** | ||
321 | * idr_get_new - allocate new idr entry | ||
322 | * @idp: idr handle | ||
323 | * @ptr: pointer you want associated with the id | ||
324 | * @id: pointer to the allocated handle | ||
325 | * | ||
326 | * If allocation from IDR's private freelist fails, idr_get_new_above() will | ||
327 | * return %-EAGAIN. The caller should retry the idr_pre_get() call to refill | ||
328 | * IDR's preallocation and then retry the idr_get_new_above() call. | ||
329 | * | ||
330 | * If the idr is full idr_get_new_above() will return %-ENOSPC. | ||
331 | * | ||
332 | * @id returns a value in the range %0 ... %0x7fffffff | ||
333 | */ | ||
334 | int idr_get_new(struct idr *idp, void *ptr, int *id) | ||
335 | { | ||
336 | int rv; | ||
337 | |||
338 | rv = idr_get_new_above_int(idp, ptr, 0); | ||
339 | /* | ||
340 | * This is a cheap hack until the IDR code can be fixed to | ||
341 | * return proper error values. | ||
342 | */ | ||
343 | if (rv < 0) | ||
344 | return _idr_rc_to_errno(rv); | ||
345 | *id = rv; | ||
346 | return 0; | ||
347 | } | ||
348 | EXPORT_SYMBOL(idr_get_new); | ||
349 | |||
350 | static void idr_remove_warning(int id) | 320 | static void idr_remove_warning(int id) |
351 | { | 321 | { |
352 | printk(KERN_WARNING | 322 | printk(KERN_WARNING |
@@ -857,25 +827,6 @@ int ida_get_new_above(struct ida *ida, int starting_id, int *p_id) | |||
857 | EXPORT_SYMBOL(ida_get_new_above); | 827 | EXPORT_SYMBOL(ida_get_new_above); |
858 | 828 | ||
859 | /** | 829 | /** |
860 | * ida_get_new - allocate new ID | ||
861 | * @ida: idr handle | ||
862 | * @p_id: pointer to the allocated handle | ||
863 | * | ||
864 | * Allocate new ID. It should be called with any required locks. | ||
865 | * | ||
866 | * If memory is required, it will return %-EAGAIN, you should unlock | ||
867 | * and go back to the idr_pre_get() call. If the idr is full, it will | ||
868 | * return %-ENOSPC. | ||
869 | * | ||
870 | * @p_id returns a value in the range %0 ... %0x7fffffff. | ||
871 | */ | ||
872 | int ida_get_new(struct ida *ida, int *p_id) | ||
873 | { | ||
874 | return ida_get_new_above(ida, 0, p_id); | ||
875 | } | ||
876 | EXPORT_SYMBOL(ida_get_new); | ||
877 | |||
878 | /** | ||
879 | * ida_remove - remove the given ID | 830 | * ida_remove - remove the given ID |
880 | * @ida: ida handle | 831 | * @ida: ida handle |
881 | * @id: ID to free | 832 | * @id: ID to free |