openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

idr: refactor idr_get_new_above() 

Move slot filling to idr_fill_slot() from idr_get_new_above_int() and
make idr_get_new_above() directly call it.  idr_get_new_above_int() is
no longer needed and removed.

This will be used to implement a new ID allocation interface.

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:54 -08:00 committed by Linus Torvalds
parent 12d1b4393e
commit 3594eb2894
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/idr.c
View File

@ -278,24 +278,15 @@ static int idr_get_empty_slot(struct idr *idp, int starting_id,
return(v); return(v);
} }
static int idr_get_new_above_int(struct idr *idp, void *ptr, int starting_id) /*
* @id and @pa are from a successful allocation from idr_get_empty_slot().
* Install the user pointer @ptr and mark the slot full.
*/
static void idr_fill_slot(void *ptr, int id, struct idr_layer **pa)
{ {
struct idr_layer *pa[MAX_IDR_LEVEL]; rcu_assign_pointer(pa[0]->ary[id & IDR_MASK], (struct idr_layer *)ptr);
int id; pa[0]->count++;
idr_mark_full(pa, id);
id = idr_get_empty_slot(idp, starting_id, pa);
if (id >= 0) {
/*
* Successfully found an empty slot. Install the user
* pointer and mark the slot full.
*/
rcu_assign_pointer(pa[0]->ary[id & IDR_MASK],
(struct idr_layer *)ptr);
pa[0]->count++;
idr_mark_full(pa, id);
}
return id;
} }
/** /**
@ -318,11 +309,14 @@ static int idr_get_new_above_int(struct idr *idp, void *ptr, int starting_id)
*/ */
int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id) int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id)
{ {
struct idr_layer *pa[MAX_IDR_LEVEL];
int rv; int rv;
rv = idr_get_new_above_int(idp, ptr, starting_id); rv = idr_get_empty_slot(idp, starting_id, pa);
if (rv < 0) if (rv < 0)
return rv == -ENOMEM ? -EAGAIN : rv; return rv == -ENOMEM ? -EAGAIN : rv;
idr_fill_slot(ptr, rv, pa);
*id = rv; *id = rv;
return 0; return 0;
} }