leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH 2/2] anondev: switch to IDA

Browse Source 
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
This commit is contained in:
Alexey Dobriyan 2008-08-28 06:26:23 +04:00 committed by Al Viro
parent 6de24f0ed0
commit ad76cbc63b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/super.c
View File

@ -682,7 +682,7 @@ void emergency_remount(void)
* filesystems which don't use real block-devices. -- jrs * filesystems which don't use real block-devices. -- jrs
*/ */
static DEFINE_IDR(unnamed_dev_idr); static DEFINE_IDA(unnamed_dev_ida);
static DEFINE_SPINLOCK(unnamed_dev_lock);/* protects the above */ static DEFINE_SPINLOCK(unnamed_dev_lock);/* protects the above */
int set_anon_super(struct super_block *s, void *data) int set_anon_super(struct super_block *s, void *data)
@ -691,10 +691,10 @@ int set_anon_super(struct super_block *s, void *data)
int error; int error;
retry: retry:
if (idr_pre_get(&unnamed_dev_idr, GFP_ATOMIC) == 0) if (ida_pre_get(&unnamed_dev_ida, GFP_ATOMIC) == 0)
return -ENOMEM; return -ENOMEM;
spin_lock(&unnamed_dev_lock); spin_lock(&unnamed_dev_lock);
error = idr_get_new(&unnamed_dev_idr, NULL, &dev); error = ida_get_new(&unnamed_dev_ida, &dev);
spin_unlock(&unnamed_dev_lock); spin_unlock(&unnamed_dev_lock);
if (error == -EAGAIN) if (error == -EAGAIN)
/* We raced and lost with another CPU. */ /* We raced and lost with another CPU. */
@ -704,7 +704,7 @@ int set_anon_super(struct super_block *s, void *data)
if ((dev & MAX_ID_MASK) == (1 << MINORBITS)) { if ((dev & MAX_ID_MASK) == (1 << MINORBITS)) {
spin_lock(&unnamed_dev_lock); spin_lock(&unnamed_dev_lock);
idr_remove(&unnamed_dev_idr, dev); ida_remove(&unnamed_dev_ida, dev);
spin_unlock(&unnamed_dev_lock); spin_unlock(&unnamed_dev_lock);
return -EMFILE; return -EMFILE;
} }
@ -720,7 +720,7 @@ void kill_anon_super(struct super_block *sb)
generic_shutdown_super(sb); generic_shutdown_super(sb);
spin_lock(&unnamed_dev_lock); spin_lock(&unnamed_dev_lock);
idr_remove(&unnamed_dev_idr, slot); ida_remove(&unnamed_dev_ida, slot);
spin_unlock(&unnamed_dev_lock); spin_unlock(&unnamed_dev_lock);
} }