commit 55b7ae50167efc9b1c4f8fb60a99478cd46a82f7
author Davidlohr Bueso <dave@stgolabs.net> Tue Jun 30 14:58:42 2015 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Jun 30 19:44:58 2015 -0700
tree 62c41a1492732e4e012c09ad4e319221acd7e51e
parent ff35e5ef86fea1fa84eb7fdc939d0b1e3f1222bf

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>

ipc/msg.c

diff --git a/ipc/msg.c b/ipc/msg.c
index a9c3c51..66c4f56 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -76,7 +76,7 @@
 
 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))
 		return ERR_CAST(ipcp);