ipc: rename ipc_obtain_object

[pandora-kernel.git] / ipc / util.c

diff --git a/ipc/util.c b/ipc/util.c
index 537a41c..3fdfabf 100644 (file)
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -555,7 +555,7 @@ void ipc64_perm_to_ipc_perm(struct ipc64_perm *in, struct ipc_perm *out)
  * Call inside the RCU critical section.
  * 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;
        int lid = ipcid_to_idx(id);
@@ -581,7 +581,7 @@ struct kern_ipc_perm *ipc_lock(struct ipc_ids *ids, int id)
        struct kern_ipc_perm *out;
 
        rcu_read_lock();
-       out = ipc_obtain_object(ids, id);
+       out = ipc_obtain_object_idr(ids, id);
        if (IS_ERR(out))
                goto err1;
 
@@ -605,7 +605,7 @@ err1:
  * @ids: ipc identifier set
  * @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.
  *
  * Call inside the RCU critical section.
@@ -613,7 +613,7 @@ err1:
  */
 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))
                goto out;