diff options
author | Davidlohr Bueso <davidlohr.bueso@hp.com> | 2013-09-11 17:26:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 18:59:44 -0400 |
commit | 7a25dd9e042b2b94202a67e5551112f4ac87285a (patch) | |
tree | 17a51b7eaf606565c6018d46192d1700f8b6a4b8 /ipc | |
parent | 32a2750010981216fb788c5190fb0e646abfab30 (diff) |
ipc, shm: drop shm_lock_check
This function was replaced by a the lockless shm_obtain_object_check(),
and no longer has any users.
Signed-off-by: Davidlohr Bueso <davidlohr.bueso@hp.com>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Rik van Riel <riel@redhat.com>
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')
-rw-r--r-- | ipc/shm.c | 11 |
1 files changed, 0 insertions, 11 deletions
@@ -167,17 +167,6 @@ static inline void shm_lock_by_ptr(struct shmid_kernel *ipcp) | |||
167 | ipc_lock_object(&ipcp->shm_perm); | 167 | ipc_lock_object(&ipcp->shm_perm); |
168 | } | 168 | } |
169 | 169 | ||
170 | static inline struct shmid_kernel *shm_lock_check(struct ipc_namespace *ns, | ||
171 | int id) | ||
172 | { | ||
173 | struct kern_ipc_perm *ipcp = ipc_lock_check(&shm_ids(ns), id); | ||
174 | |||
175 | if (IS_ERR(ipcp)) | ||
176 | return (struct shmid_kernel *)ipcp; | ||
177 | |||
178 | return container_of(ipcp, struct shmid_kernel, shm_perm); | ||
179 | } | ||
180 | |||
181 | static inline void shm_rmid(struct ipc_namespace *ns, struct shmid_kernel *s) | 170 | static inline void shm_rmid(struct ipc_namespace *ns, struct shmid_kernel *s) |
182 | { | 171 | { |
183 | ipc_rmid(&shm_ids(ns), &s->shm_perm); | 172 | ipc_rmid(&shm_ids(ns), &s->shm_perm); |