adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] devpts: switch to IDA

Browse source 
Devpts code wants just numbers for tty indexes.

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:42:16 +04:00 committed by Al Viro
parent 9a18540915
commit 7ee7c12b71
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fs/devpts/inode.c
View file

@ -29,7 +29,7 @@
#define DEVPTS_DEFAULT_MODE 0600 #define DEVPTS_DEFAULT_MODE 0600
extern int pty_limit; /* Config limit on Unix98 ptys */ extern int pty_limit; /* Config limit on Unix98 ptys */
static DEFINE_IDR(allocated_ptys); static DEFINE_IDA(allocated_ptys);
static DEFINE_MUTEX(allocated_ptys_lock); static DEFINE_MUTEX(allocated_ptys_lock);
static struct vfsmount *devpts_mnt; static struct vfsmount *devpts_mnt;
@ -180,24 +180,24 @@ static struct dentry *get_node(int num)
int devpts_new_index(void) int devpts_new_index(void)
{ {
int index; int index;
int idr_ret; int ida_ret;
retry: retry:
if (!idr_pre_get(&allocated_ptys, GFP_KERNEL)) { if (!ida_pre_get(&allocated_ptys, GFP_KERNEL)) {
return -ENOMEM; return -ENOMEM;
} }
mutex_lock(&allocated_ptys_lock); mutex_lock(&allocated_ptys_lock);
idr_ret = idr_get_new(&allocated_ptys, NULL, &index); ida_ret = ida_get_new(&allocated_ptys, &index);
if (idr_ret < 0) { if (ida_ret < 0) {
mutex_unlock(&allocated_ptys_lock); mutex_unlock(&allocated_ptys_lock);
if (idr_ret == -EAGAIN) if (ida_ret == -EAGAIN)
goto retry; goto retry;
return -EIO; return -EIO;
} }
if (index >= pty_limit) { if (index >= pty_limit) {
idr_remove(&allocated_ptys, index); ida_remove(&allocated_ptys, index);
mutex_unlock(&allocated_ptys_lock); mutex_unlock(&allocated_ptys_lock);
return -EIO; return -EIO;
} }
@ -208,7 +208,7 @@ retry:
void devpts_kill_index(int idx) void devpts_kill_index(int idx)
{ {
mutex_lock(&allocated_ptys_lock); mutex_lock(&allocated_ptys_lock);
idr_remove(&allocated_ptys, idx); ida_remove(&allocated_ptys, idx);
mutex_unlock(&allocated_ptys_lock); mutex_unlock(&allocated_ptys_lock);
} }