summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavidlohr Bueso <davidlohr.bueso@hp.com>2013-09-12 01:26:30 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-12 02:59:44 +0400
commit7a25dd9e042b2b94202a67e5551112f4ac87285a (patch)
tree17a51b7eaf606565c6018d46192d1700f8b6a4b8
parent32a2750010981216fb788c5190fb0e646abfab30 (diff)
downloadlinux-7a25dd9e042b2b94202a67e5551112f4ac87285a.tar.xz
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>
-rw-r--r--ipc/shm.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index a0ed957cefc9..2821cdf93adb 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);