diff options
author | Davidlohr Bueso <davidlohr.bueso@hp.com> | 2013-07-08 19:01:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-09 13:33:27 -0400 |
commit | 9ad66ae65fc8d3e7e3344310fb0aa835910264fe (patch) | |
tree | 25dbc032d43dbc9e5cb85c93408fa06e27e5e29d /ipc/msg.c | |
parent | 41a0d523d0f626e9da0dc01de47f1b89058033cf (diff) |
ipc: remove unused functions
We can now drop the msg_lock and msg_lock_check functions along with a
bogus comment introduced previously in semctl_down.
Signed-off-by: Davidlohr Bueso <davidlohr.bueso@hp.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc/msg.c')
-rw-r--r-- | ipc/msg.c | 25 |
1 files changed, 0 insertions, 25 deletions
@@ -141,31 +141,6 @@ void __init msg_init(void) | |||
141 | IPC_MSG_IDS, sysvipc_msg_proc_show); | 141 | IPC_MSG_IDS, sysvipc_msg_proc_show); |
142 | } | 142 | } |
143 | 143 | ||
144 | /* | ||
145 | * msg_lock_(check_) routines are called in the paths where the rw_mutex | ||
146 | * is not held. | ||
147 | */ | ||
148 | static inline struct msg_queue *msg_lock(struct ipc_namespace *ns, int id) | ||
149 | { | ||
150 | struct kern_ipc_perm *ipcp = ipc_lock(&msg_ids(ns), id); | ||
151 | |||
152 | if (IS_ERR(ipcp)) | ||
153 | return (struct msg_queue *)ipcp; | ||
154 | |||
155 | return container_of(ipcp, struct msg_queue, q_perm); | ||
156 | } | ||
157 | |||
158 | static inline struct msg_queue *msg_lock_check(struct ipc_namespace *ns, | ||
159 | int id) | ||
160 | { | ||
161 | struct kern_ipc_perm *ipcp = ipc_lock_check(&msg_ids(ns), id); | ||
162 | |||
163 | if (IS_ERR(ipcp)) | ||
164 | return (struct msg_queue *)ipcp; | ||
165 | |||
166 | return container_of(ipcp, struct msg_queue, q_perm); | ||
167 | } | ||
168 | |||
169 | static inline struct msg_queue *msq_obtain_object(struct ipc_namespace *ns, int id) | 144 | static inline struct msg_queue *msq_obtain_object(struct ipc_namespace *ns, int id) |
170 | { | 145 | { |
171 | struct kern_ipc_perm *ipcp = ipc_obtain_object(&msg_ids(ns), id); | 146 | struct kern_ipc_perm *ipcp = ipc_obtain_object(&msg_ids(ns), id); |