lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Alexey Dobriyan
2008-07-26 11:21:37 +04:00
committed by Al Viro
parent 67935df49d
commit 9a18540915
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fs/proc/generic.c
View File

@@ -300,7 +300,7 @@ out:
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)
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 @@ retry:
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 @@ retry:
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);
} }