git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/mtd-2.6
[pandora-kernel.git]
/
fs
/
devpts
/
inode.c
diff --git
a/fs/devpts/inode.c
b/fs/devpts/inode.c
index
285b64a
..
488eb42
100644
(file)
--- a/
fs/devpts/inode.c
+++ b/
fs/devpts/inode.c
@@
-29,7
+29,7
@@
#define DEVPTS_DEFAULT_MODE 0600
extern int pty_limit; /* Config limit on Unix98 ptys */
#define DEVPTS_DEFAULT_MODE 0600
extern int pty_limit; /* Config limit on Unix98 ptys */
-static DEFINE_ID
R
(allocated_ptys);
+static DEFINE_ID
A
(allocated_ptys);
static DEFINE_MUTEX(allocated_ptys_lock);
static struct vfsmount *devpts_mnt;
static DEFINE_MUTEX(allocated_ptys_lock);
static struct vfsmount *devpts_mnt;
@@
-180,24
+180,24
@@
static struct dentry *get_node(int num)
int devpts_new_index(void)
{
int index;
int devpts_new_index(void)
{
int index;
- int id
r
_ret;
+ int id
a
_ret;
retry:
retry:
- if (!id
r
_pre_get(&allocated_ptys, GFP_KERNEL)) {
+ if (!id
a
_pre_get(&allocated_ptys, GFP_KERNEL)) {
return -ENOMEM;
}
mutex_lock(&allocated_ptys_lock);
return -ENOMEM;
}
mutex_lock(&allocated_ptys_lock);
- id
r_ret = idr_get_new(&allocated_ptys, NULL
, &index);
- if (id
r
_ret < 0) {
+ id
a_ret = ida_get_new(&allocated_ptys
, &index);
+ if (id
a
_ret < 0) {
mutex_unlock(&allocated_ptys_lock);
mutex_unlock(&allocated_ptys_lock);
- if (id
r
_ret == -EAGAIN)
+ if (id
a
_ret == -EAGAIN)
goto retry;
return -EIO;
}
if (index >= pty_limit) {
goto retry;
return -EIO;
}
if (index >= pty_limit) {
- id
r
_remove(&allocated_ptys, index);
+ id
a
_remove(&allocated_ptys, index);
mutex_unlock(&allocated_ptys_lock);
return -EIO;
}
mutex_unlock(&allocated_ptys_lock);
return -EIO;
}
@@
-208,7
+208,7
@@
retry:
void devpts_kill_index(int idx)
{
mutex_lock(&allocated_ptys_lock);
void devpts_kill_index(int idx)
{
mutex_lock(&allocated_ptys_lock);
- id
r
_remove(&allocated_ptys, idx);
+ id
a
_remove(&allocated_ptys, idx);
mutex_unlock(&allocated_ptys_lock);
}
mutex_unlock(&allocated_ptys_lock);
}