Commit 7a25dd9e authored Sep 11, 2013 by Davidlohr Bueso Committed by Linus Torvalds Sep 11, 2013

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>

parent 32a27500

ipc/shm.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -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);