Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ad66ae6 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Linus Torvalds
Browse files

ipc: remove unused functions 



We can now drop the msg_lock and msg_lock_check functions along with a
bogus comment introduced previously in semctl_down.

Signed-off-by: default avatarDavidlohr Bueso <davidlohr.bueso@hp.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 41a0d523

ipc/msg.c

+0 −25
Original line number Diff line number Diff line
@@ -141,31 +141,6 @@ void __init msg_init(void) 
				IPC_MSG_IDS, sysvipc_msg_proc_show);

}



/*

 * msg_lock_(check_) routines are called in the paths where the rw_mutex

 * is not held.

 */

static inline struct msg_queue *msg_lock(struct ipc_namespace *ns, int id)

{

	struct kern_ipc_perm *ipcp = ipc_lock(&msg_ids(ns), id);



	if (IS_ERR(ipcp))

		return (struct msg_queue *)ipcp;



	return container_of(ipcp, struct msg_queue, q_perm);

}



static inline struct msg_queue *msg_lock_check(struct ipc_namespace *ns,

						int id)

{

	struct kern_ipc_perm *ipcp = ipc_lock_check(&msg_ids(ns), id);



	if (IS_ERR(ipcp))

		return (struct msg_queue *)ipcp;



	return container_of(ipcp, struct msg_queue, q_perm);

}



static inline struct msg_queue *msq_obtain_object(struct ipc_namespace *ns, int id)

{

	struct kern_ipc_perm *ipcp = ipc_obtain_object(&msg_ids(ns), id);

ipc/sem.c

+0 −1
Original line number Diff line number Diff line
@@ -1296,7 +1296,6 @@ static int semctl_down(struct ipc_namespace *ns, int semid, 
				      &semid64.sem_perm, 0);

	if (IS_ERR(ipcp)) {

		err = PTR_ERR(ipcp);

		/* the ipc lock is not held upon failure */

		goto out_unlock1;

	}