Commit 55b7ae50 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Linus Torvalds

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: default avatarDavidlohr Bueso <dbueso@suse.de>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ff35e5ef
...@@ -76,7 +76,7 @@ struct msg_sender { ...@@ -76,7 +76,7 @@ struct msg_sender {
static inline struct msg_queue *msq_obtain_object(struct ipc_namespace *ns, int id) static inline struct msg_queue *msq_obtain_object(struct ipc_namespace *ns, int id)
{ {
struct kern_ipc_perm *ipcp = ipc_obtain_object(&msg_ids(ns), id); struct kern_ipc_perm *ipcp = ipc_obtain_object_idr(&msg_ids(ns), id);
if (IS_ERR(ipcp)) if (IS_ERR(ipcp))
return ERR_CAST(ipcp); return ERR_CAST(ipcp);
......
...@@ -391,7 +391,7 @@ static inline struct sem_array *sem_obtain_lock(struct ipc_namespace *ns, ...@@ -391,7 +391,7 @@ static inline struct sem_array *sem_obtain_lock(struct ipc_namespace *ns,
struct kern_ipc_perm *ipcp; struct kern_ipc_perm *ipcp;
struct sem_array *sma; struct sem_array *sma;
ipcp = ipc_obtain_object(&sem_ids(ns), id); ipcp = ipc_obtain_object_idr(&sem_ids(ns), id);
if (IS_ERR(ipcp)) if (IS_ERR(ipcp))
return ERR_CAST(ipcp); return ERR_CAST(ipcp);
...@@ -410,7 +410,7 @@ static inline struct sem_array *sem_obtain_lock(struct ipc_namespace *ns, ...@@ -410,7 +410,7 @@ static inline struct sem_array *sem_obtain_lock(struct ipc_namespace *ns,
static inline struct sem_array *sem_obtain_object(struct ipc_namespace *ns, int id) static inline struct sem_array *sem_obtain_object(struct ipc_namespace *ns, int id)
{ {
struct kern_ipc_perm *ipcp = ipc_obtain_object(&sem_ids(ns), id); struct kern_ipc_perm *ipcp = ipc_obtain_object_idr(&sem_ids(ns), id);
if (IS_ERR(ipcp)) if (IS_ERR(ipcp))
return ERR_CAST(ipcp); return ERR_CAST(ipcp);
......
...@@ -129,7 +129,7 @@ void __init shm_init(void) ...@@ -129,7 +129,7 @@ void __init shm_init(void)
static inline struct shmid_kernel *shm_obtain_object(struct ipc_namespace *ns, int id) static inline struct shmid_kernel *shm_obtain_object(struct ipc_namespace *ns, int id)
{ {
struct kern_ipc_perm *ipcp = ipc_obtain_object(&shm_ids(ns), id); struct kern_ipc_perm *ipcp = ipc_obtain_object_idr(&shm_ids(ns), id);
if (IS_ERR(ipcp)) if (IS_ERR(ipcp))
return ERR_CAST(ipcp); return ERR_CAST(ipcp);
......
...@@ -555,7 +555,7 @@ void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out) ...@@ -555,7 +555,7 @@ void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out)
* Call inside the RCU critical section. * Call inside the RCU critical section.
* The ipc object is *not* locked on exit. * The ipc object is *not* locked on exit.
*/ */
struct kern_ipc_perm *ipc_obtain_object(struct ipc_ids *ids, int id) struct kern_ipc_perm *ipc_obtain_object_idr(struct ipc_ids *ids, int id)
{ {
struct kern_ipc_perm *out; struct kern_ipc_perm *out;
int lid = ipcid_to_idx(id); int lid = ipcid_to_idx(id);
...@@ -581,7 +581,7 @@ struct kern_ipc_perm *ipc_lock(struct ipc_ids *ids, int id) ...@@ -581,7 +581,7 @@ struct kern_ipc_perm *ipc_lock(struct ipc_ids *ids, int id)
struct kern_ipc_perm *out; struct kern_ipc_perm *out;
rcu_read_lock(); rcu_read_lock();
out = ipc_obtain_object(ids, id); out = ipc_obtain_object_idr(ids, id);
if (IS_ERR(out)) if (IS_ERR(out))
goto err1; goto err1;
...@@ -605,7 +605,7 @@ struct kern_ipc_perm *ipc_lock(struct ipc_ids *ids, int id) ...@@ -605,7 +605,7 @@ struct kern_ipc_perm *ipc_lock(struct ipc_ids *ids, int id)
* @ids: ipc identifier set * @ids: ipc identifier set
* @id: ipc id to look for * @id: ipc id to look for
* *
* Similar to ipc_obtain_object() but also checks * Similar to ipc_obtain_object_idr() but also checks
* the ipc object reference counter. * the ipc object reference counter.
* *
* Call inside the RCU critical section. * Call inside the RCU critical section.
...@@ -613,7 +613,7 @@ struct kern_ipc_perm *ipc_lock(struct ipc_ids *ids, int id) ...@@ -613,7 +613,7 @@ struct kern_ipc_perm *ipc_lock(struct ipc_ids *ids, int id)
*/ */
struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id) struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id)
{ {
struct kern_ipc_perm *out = ipc_obtain_object(ids, id); struct kern_ipc_perm *out = ipc_obtain_object_idr(ids, id);
if (IS_ERR(out)) if (IS_ERR(out))
goto out; goto out;
......
...@@ -132,7 +132,7 @@ void ipc_rcu_putref(void *ptr, void (*func)(struct rcu_head *head)); ...@@ -132,7 +132,7 @@ void ipc_rcu_putref(void *ptr, void (*func)(struct rcu_head *head));
void ipc_rcu_free(struct rcu_head *head); void ipc_rcu_free(struct rcu_head *head);
struct kern_ipc_perm *ipc_lock(struct ipc_ids *, int); struct kern_ipc_perm *ipc_lock(struct ipc_ids *, int);
struct kern_ipc_perm *ipc_obtain_object(struct ipc_ids *ids, int id); struct kern_ipc_perm *ipc_obtain_object_idr(struct ipc_ids *ids, int id);
void kernel_to_ipc64_perm(struct kern_ipc_perm *in, struct ipc64_perm *out); void kernel_to_ipc64_perm(struct kern_ipc_perm *in, struct ipc64_perm *out);
void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out); void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment