diff options
author | Davidlohr Bueso <dave@stgolabs.net> | 2015-06-30 17:58:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-30 22:44:58 -0400 |
commit | 55b7ae50167efc9b1c4f8fb60a99478cd46a82f7 (patch) | |
tree | 62c41a1492732e4e012c09ad4e319221acd7e51e /ipc/sem.c | |
parent | ff35e5ef86fea1fa84eb7fdc939d0b1e3f1222bf (diff) |
ipc: rename ipc_obtain_object
... to ipc_obtain_object_idr, which is more meaningful and makes the code
slightly easier to follow.
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc/sem.c')
-rw-r--r-- | ipc/sem.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -391,7 +391,7 @@ static inline struct sem_array *sem_obtain_lock(struct ipc_namespace *ns, | |||
391 | struct kern_ipc_perm *ipcp; | 391 | struct kern_ipc_perm *ipcp; |
392 | struct sem_array *sma; | 392 | struct sem_array *sma; |
393 | 393 | ||
394 | ipcp = ipc_obtain_object(&sem_ids(ns), id); | 394 | ipcp = ipc_obtain_object_idr(&sem_ids(ns), id); |
395 | if (IS_ERR(ipcp)) | 395 | if (IS_ERR(ipcp)) |
396 | return ERR_CAST(ipcp); | 396 | return ERR_CAST(ipcp); |
397 | 397 | ||
@@ -410,7 +410,7 @@ static inline struct sem_array *sem_obtain_lock(struct ipc_namespace *ns, | |||
410 | 410 | ||
411 | static inline struct sem_array *sem_obtain_object(struct ipc_namespace *ns, int id) | 411 | static inline struct sem_array *sem_obtain_object(struct ipc_namespace *ns, int id) |
412 | { | 412 | { |
413 | struct kern_ipc_perm *ipcp = ipc_obtain_object(&sem_ids(ns), id); | 413 | struct kern_ipc_perm *ipcp = ipc_obtain_object_idr(&sem_ids(ns), id); |
414 | 414 | ||
415 | if (IS_ERR(ipcp)) | 415 | if (IS_ERR(ipcp)) |
416 | return ERR_CAST(ipcp); | 416 | return ERR_CAST(ipcp); |