| From 7a25dd9e042b2b94202a67e5551112f4ac87285a Mon Sep 17 00:00:00 2001 |
| From: Davidlohr Bueso <davidlohr.bueso@hp.com> |
| Date: Wed, 11 Sep 2013 14:26:30 -0700 |
| Subject: ipc, shm: drop shm_lock_check |
| |
| From: Davidlohr Bueso <davidlohr.bueso@hp.com> |
| |
| commit 7a25dd9e042b2b94202a67e5551112f4ac87285a upstream. |
| |
| 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> |
| Cc: Mike Galbraith <efault@gmx.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| ipc/shm.c | 11 ----------- |
| 1 file changed, 11 deletions(-) |
| |
| --- a/ipc/shm.c |
| +++ b/ipc/shm.c |
| @@ -167,17 +167,6 @@ static inline void shm_lock_by_ptr(struc |
| ipc_lock_object(&ipcp->shm_perm); |
| } |
| |
| -static inline struct shmid_kernel *shm_lock_check(struct ipc_namespace *ns, |
| - int id) |
| -{ |
| - struct kern_ipc_perm *ipcp = ipc_lock_check(&shm_ids(ns), id); |
| - |
| - if (IS_ERR(ipcp)) |
| - return (struct shmid_kernel *)ipcp; |
| - |
| - return container_of(ipcp, struct shmid_kernel, shm_perm); |
| -} |
| - |
| static inline void shm_rmid(struct ipc_namespace *ns, struct shmid_kernel *s) |
| { |
| ipc_rmid(&shm_ids(ns), &s->shm_perm); |