This is a note to let you know that I've just added the patch titled
ipc,msg: drop msg_unlock
to the 3.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
ipc-msg-drop-msg_unlock.patch
and it can be found in the queue-3.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 4718787d1f626f45ddb239912bc07266b9880044 Mon Sep 17 00:00:00 2001
From: Davidlohr Bueso <[email protected]>
Date: Wed, 11 Sep 2013 14:26:25 -0700
Subject: ipc,msg: drop msg_unlock
From: Davidlohr Bueso <[email protected]>
commit 4718787d1f626f45ddb239912bc07266b9880044 upstream.
There is only one user left, drop this function and just call
ipc_unlock_object() and rcu_read_unlock().
Signed-off-by: Davidlohr Bueso <[email protected]>
Tested-by: Sedat Dilek <[email protected]>
Cc: Rik van Riel <[email protected]>
Cc: Manfred Spraul <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Cc: Mike Galbraith <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
ipc/msg.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- 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
@@ -278,7 +276,8 @@ static void freeque(struct ipc_namespace
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);
Patches currently in stable-queue which might be from [email protected] are
queue-3.11/ipc-drop-ipc_lock_by_ptr.patch
queue-3.11/ipc-msg-drop-msg_unlock.patch
queue-3.11/ipc-shm-shorten-critical-region-in-shmctl_down.patch
queue-3.11/ipc-rename-ids-rw_mutex.patch
queue-3.11/ipc-shm-introduce-lockless-functions-to-obtain-the-ipc-object.patch
queue-3.11/ipc-shm-shorten-critical-region-for-shmat.patch
queue-3.11/ipc-shm-shorten-critical-region-for-shmctl.patch
queue-3.11/ipc-shm-introduce-shmctl_nolock.patch
queue-3.11/ipc-drop-ipcctl_pre_down.patch
queue-3.11/ipc-document-general-ipc-locking-scheme.patch
queue-3.11/ipc-shm-drop-shm_lock_check.patch
queue-3.11/ipc-shm-guard-against-non-existant-vma-in-shmdt-2.patch
queue-3.11/ipc-shm-cleanup-do_shmat-pasta.patch
queue-3.11/ipc-drop-ipc_lock_check.patch
queue-3.11/ipc-shm-make-shmctl_nolock-lockless.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
