This is a note to let you know that I've just added the patch titled
ipc: drop ipc_lock_check
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-drop-ipc_lock_check.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 <stable@xxxxxxxxxxxxxxx> know about it.
>From 20b8875abcf2daa1dda5cf70bd6369df5e85d4c1 Mon Sep 17 00:00:00 2001
From: Davidlohr Bueso <davidlohr.bueso@xxxxxx>
Date: Wed, 11 Sep 2013 14:26:31 -0700
Subject: ipc: drop ipc_lock_check
From: Davidlohr Bueso <davidlohr.bueso@xxxxxx>
commit 20b8875abcf2daa1dda5cf70bd6369df5e85d4c1 upstream.
No remaining users, we now use ipc_obtain_object_check().
Signed-off-by: Davidlohr Bueso <davidlohr.bueso@xxxxxx>
Cc: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Cc: Rik van Riel <riel@xxxxxxxxxx>
Cc: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
ipc/util.c | 16 ----------------
ipc/util.h | 1 -
2 files changed, 17 deletions(-)
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -678,22 +678,6 @@ out:
return out;
}
-struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id)
-{
- struct kern_ipc_perm *out;
-
- out = ipc_lock(ids, id);
- if (IS_ERR(out))
- return out;
-
- if (ipc_checkid(out, id)) {
- ipc_unlock(out);
- return ERR_PTR(-EIDRM);
- }
-
- return out;
-}
-
/**
* ipcget - Common sys_*get() code
* @ns : namsepace
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -185,7 +185,6 @@ static inline void ipc_unlock(struct ker
rcu_read_unlock();
}
-struct kern_ipc_perm *ipc_lock_check(struct ipc_ids *ids, int id);
struct kern_ipc_perm *ipc_obtain_object_check(struct ipc_ids *ids, int id);
int ipcget(struct ipc_namespace *ns, struct ipc_ids *ids,
struct ipc_ops *ops, struct ipc_params *params);
Patches currently in stable-queue which might be from davidlohr.bueso@xxxxxx 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 majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html