diff options
-rw-r--r-- | fs/devpts/inode.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c index 285b64a8b06e..488eb424f662 100644 --- a/fs/devpts/inode.c +++ b/fs/devpts/inode.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #define DEVPTS_DEFAULT_MODE 0600 | 29 | #define DEVPTS_DEFAULT_MODE 0600 |
30 | 30 | ||
31 | extern int pty_limit; /* Config limit on Unix98 ptys */ | 31 | extern int pty_limit; /* Config limit on Unix98 ptys */ |
32 | static DEFINE_IDR(allocated_ptys); | 32 | static DEFINE_IDA(allocated_ptys); |
33 | static DEFINE_MUTEX(allocated_ptys_lock); | 33 | static DEFINE_MUTEX(allocated_ptys_lock); |
34 | 34 | ||
35 | static struct vfsmount *devpts_mnt; | 35 | static struct vfsmount *devpts_mnt; |
@@ -180,24 +180,24 @@ static struct dentry *get_node(int num) | |||
180 | int devpts_new_index(void) | 180 | int devpts_new_index(void) |
181 | { | 181 | { |
182 | int index; | 182 | int index; |
183 | int idr_ret; | 183 | int ida_ret; |
184 | 184 | ||
185 | retry: | 185 | retry: |
186 | if (!idr_pre_get(&allocated_ptys, GFP_KERNEL)) { | 186 | if (!ida_pre_get(&allocated_ptys, GFP_KERNEL)) { |
187 | return -ENOMEM; | 187 | return -ENOMEM; |
188 | } | 188 | } |
189 | 189 | ||
190 | mutex_lock(&allocated_ptys_lock); | 190 | mutex_lock(&allocated_ptys_lock); |
191 | idr_ret = idr_get_new(&allocated_ptys, NULL, &index); | 191 | ida_ret = ida_get_new(&allocated_ptys, &index); |
192 | if (idr_ret < 0) { | 192 | if (ida_ret < 0) { |
193 | mutex_unlock(&allocated_ptys_lock); | 193 | mutex_unlock(&allocated_ptys_lock); |
194 | if (idr_ret == -EAGAIN) | 194 | if (ida_ret == -EAGAIN) |
195 | goto retry; | 195 | goto retry; |
196 | return -EIO; | 196 | return -EIO; |
197 | } | 197 | } |
198 | 198 | ||
199 | if (index >= pty_limit) { | 199 | if (index >= pty_limit) { |
200 | idr_remove(&allocated_ptys, index); | 200 | ida_remove(&allocated_ptys, index); |
201 | mutex_unlock(&allocated_ptys_lock); | 201 | mutex_unlock(&allocated_ptys_lock); |
202 | return -EIO; | 202 | return -EIO; |
203 | } | 203 | } |
@@ -208,7 +208,7 @@ retry: | |||
208 | void devpts_kill_index(int idx) | 208 | void devpts_kill_index(int idx) |
209 | { | 209 | { |
210 | mutex_lock(&allocated_ptys_lock); | 210 | mutex_lock(&allocated_ptys_lock); |
211 | idr_remove(&allocated_ptys, idx); | 211 | ida_remove(&allocated_ptys, idx); |
212 | mutex_unlock(&allocated_ptys_lock); | 212 | mutex_unlock(&allocated_ptys_lock); |
213 | } | 213 | } |
214 | 214 | ||