Commit 9a185409 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Al Viro

[PATCH 2/2] proc: switch inode number allocation to IDA

proc doesn't use "associate pointer with id" feature of IDR, so switch
to IDA.

NOTE, NOTE, NOTE:
	Do not apply if release_inode_number() still mantions MAX_ID_MASK!
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 67935df4
...@@ -300,7 +300,7 @@ static int xlate_proc_name(const char *name, ...@@ -300,7 +300,7 @@ static int xlate_proc_name(const char *name,
return rtn; return rtn;
} }
static DEFINE_IDR(proc_inum_idr); static DEFINE_IDA(proc_inum_ida);
static DEFINE_SPINLOCK(proc_inum_lock); /* protects the above */ static DEFINE_SPINLOCK(proc_inum_lock); /* protects the above */
#define PROC_DYNAMIC_FIRST 0xF0000000U #define PROC_DYNAMIC_FIRST 0xF0000000U
...@@ -315,11 +315,11 @@ static unsigned int get_inode_number(void) ...@@ -315,11 +315,11 @@ static unsigned int get_inode_number(void)
int error; int error;
retry: retry:
if (idr_pre_get(&proc_inum_idr, GFP_KERNEL) == 0) if (ida_pre_get(&proc_inum_ida, GFP_KERNEL) == 0)
return 0; return 0;
spin_lock(&proc_inum_lock); spin_lock(&proc_inum_lock);
error = idr_get_new(&proc_inum_idr, NULL, &i); error = ida_get_new(&proc_inum_ida, &i);
spin_unlock(&proc_inum_lock); spin_unlock(&proc_inum_lock);
if (error == -EAGAIN) if (error == -EAGAIN)
goto retry; goto retry;
...@@ -328,7 +328,7 @@ static unsigned int get_inode_number(void) ...@@ -328,7 +328,7 @@ static unsigned int get_inode_number(void)
if (i > UINT_MAX - PROC_DYNAMIC_FIRST) { if (i > UINT_MAX - PROC_DYNAMIC_FIRST) {
spin_lock(&proc_inum_lock); spin_lock(&proc_inum_lock);
idr_remove(&proc_inum_idr, i); ida_remove(&proc_inum_ida, i);
spin_unlock(&proc_inum_lock); spin_unlock(&proc_inum_lock);
} }
return PROC_DYNAMIC_FIRST + i; return PROC_DYNAMIC_FIRST + i;
...@@ -337,7 +337,7 @@ static unsigned int get_inode_number(void) ...@@ -337,7 +337,7 @@ static unsigned int get_inode_number(void)
static void release_inode_number(unsigned int inum) static void release_inode_number(unsigned int inum)
{ {
spin_lock(&proc_inum_lock); spin_lock(&proc_inum_lock);
idr_remove(&proc_inum_idr, inum - PROC_DYNAMIC_FIRST); ida_remove(&proc_inum_ida, inum - PROC_DYNAMIC_FIRST);
spin_unlock(&proc_inum_lock); spin_unlock(&proc_inum_lock);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment