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

Commit 4718787d authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Linus Torvalds
Browse files

ipc,msg: drop msg_unlock 



There is only one user left, drop this function and just call
ipc_unlock_object() and rcu_read_unlock().

Signed-off-by: default avatarDavidlohr Bueso <davidlohr.bueso@hp.com>
Tested-by: default avatarSedat Dilek <sedat.dilek@gmail.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d9a605e4

ipc/msg.c

+2 −3
Original line number Diff line number Diff line
@@ -70,8 +70,6 @@ struct msg_sender { 


#define msg_ids(ns)	((ns)->ids[IPC_MSG_IDS])



#define msg_unlock(msq)		ipc_unlock(&(msq)->q_perm)



static void freeque(struct ipc_namespace *, struct kern_ipc_perm *);

static int newque(struct ipc_namespace *, struct ipc_params *);

#ifdef CONFIG_PROC_FS
@@ -270,7 +268,8 @@ static void freeque(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp) 
	expunge_all(msq, -EIDRM);

	ss_wakeup(&msq->q_senders, 1);

	msg_rmid(ns, msq);

	msg_unlock(msq);

	ipc_unlock_object(&msq->q_perm);

	rcu_read_unlock();



	list_for_each_entry_safe(msg, t, &msq->q_messages, m_list) {

		atomic_dec(&ns->msg_hdrs);