linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Davidlohr Bueso <davidlohr.bueso@hp.com>
To: akpm@linux-foundation.org, riel@redhat.com,
	linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: Davidlohr Bueso <davidlohr.bueso@hp.com>
Subject: [PATCH 10/11] ipc,msg: drop msg_unlock
Date: Tue, 18 Jun 2013 18:18:35 -0700	[thread overview]
Message-ID: <1371604716-3439-11-git-send-email-davidlohr.bueso@hp.com> (raw)
In-Reply-To: <1371604716-3439-1-git-send-email-davidlohr.bueso@hp.com>

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

Signed-off-by: Davidlohr Bueso <davidlohr.bueso@hp.com>
---
 ipc/msg.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ipc/msg.c b/ipc/msg.c
index 80d8aa7..091fa2b 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -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);
-- 
1.7.11.7

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  parent reply	other threads:[~2013-06-19  1:19 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-19  1:18 [PATCH 00/11] sysv ipc shared mem optimizations Davidlohr Bueso
2013-06-19  1:18 ` [PATCH 01/11] ipc,shm: introduce lockless functions to obtain the ipc object Davidlohr Bueso
2013-06-19  1:18 ` [PATCH 02/11] ipc,shm: shorten critical region in shmctl_down Davidlohr Bueso
2013-06-19  1:18 ` [PATCH 03/11] ipc: drop ipcctl_pre_down Davidlohr Bueso
2013-07-16 22:49   ` Andrew Morton
2013-06-19  1:18 ` [PATCH 04/11] ipc,shm: introduce shmctl_nolock Davidlohr Bueso
2013-06-19  1:18 ` [PATCH 05/11] ipc,shm: make shmctl_nolock lockless Davidlohr Bueso
2013-06-19  1:18 ` [PATCH 06/11] ipc,shm: shorten critical region for shmctl Davidlohr Bueso
2013-06-19  1:18 ` [PATCH 07/11] ipc,shm: cleanup do_shmat pasta Davidlohr Bueso
2013-06-19  1:18 ` [PATCH 08/11] ipc,shm: shorten critical region for shmat Davidlohr Bueso
2013-06-19  1:18 ` [PATCH 09/11] ipc: rename ids->rw_mutex Davidlohr Bueso
2013-06-19  1:18 ` Davidlohr Bueso [this message]
2013-06-19  1:18 ` [PATCH 11/11] ipc: document general ipc locking scheme Davidlohr Bueso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1371604716-3439-11-git-send-email-davidlohr.bueso@hp.com \
    --to=davidlohr.bueso@hp.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=riel@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox