diff options
| author | Davidlohr Bueso <davidlohr.bueso@hp.com> | 2013-09-11 14:26:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-18 07:45:48 -0700 |
| commit | 1129a4810a2499dd02a7bfa657053c55c35140a3 (patch) | |
| tree | 97b15def07477d641b5bd06a16512816e877261e /ipc | |
| parent | ffa02e67efa1c1bd32ea07a17d74506e5855a50d (diff) | |
| download | linux-3.10-1129a4810a2499dd02a7bfa657053c55c35140a3.tar.gz linux-3.10-1129a4810a2499dd02a7bfa657053c55c35140a3.tar.bz2 linux-3.10-1129a4810a2499dd02a7bfa657053c55c35140a3.zip | |
ipc, shm: drop shm_lock_check
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>
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/shm.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/ipc/shm.c b/ipc/shm.c index aa053a24575..de8c9876a32 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -167,17 +167,6 @@ static inline void shm_lock_by_ptr(struct shmid_kernel *ipcp) 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); |