The patch titled
ipc: introduce the ipcid_to_idx macro
has been removed from the -mm tree. Its filename was
ipc-introduce-the-ipcid_to_idx-macro.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ipc: introduce the ipcid_to_idx macro
From: Nadia Derbey <Nadia.Derbey@xxxxxxxx>
This is a trivial patch that changes all the (id % SEQ_MULTIPLIER) into a call
to the ipcid_to_idx(id) macro.
Signed-off-by: Nadia Derbey <Nadia.Derbey@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
ipc/util.c | 4 ++--
ipc/util.h | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff -puN ipc/util.c~ipc-introduce-the-ipcid_to_idx-macro ipc/util.c
--- a/ipc/util.c~ipc-introduce-the-ipcid_to_idx-macro
+++ a/ipc/util.c
@@ -413,7 +413,7 @@ int ipcget_public(struct ipc_namespace *
void ipc_rmid(struct ipc_ids *ids, struct kern_ipc_perm *ipcp)
{
- int lid = ipcp->id % SEQ_MULTIPLIER;
+ int lid = ipcid_to_idx(ipcp->id);
idr_remove(&ids->ipcs_idr, lid);
@@ -672,7 +672,7 @@ void ipc64_perm_to_ipc_perm (struct ipc6
struct kern_ipc_perm *ipc_lock(struct ipc_ids *ids, int id)
{
struct kern_ipc_perm *out;
- int lid = id % SEQ_MULTIPLIER;
+ int lid = ipcid_to_idx(id);
rcu_read_lock();
out = idr_find(&ids->ipcs_idr, lid);
diff -puN ipc/util.h~ipc-introduce-the-ipcid_to_idx-macro ipc/util.h
--- a/ipc/util.h~ipc-introduce-the-ipcid_to_idx-macro
+++ a/ipc/util.h
@@ -79,6 +79,8 @@ void __init ipc_init_proc_interface(cons
#define IPC_MSG_IDS 1
#define IPC_SHM_IDS 2
+#define ipcid_to_idx(id) ((id) % SEQ_MULTIPLIER)
+
/* must be called with ids->mutex acquired.*/
int ipc_addid(struct ipc_ids *, struct kern_ipc_perm *, int);
int ipc_get_maxid(struct ipc_ids *);
_
Patches currently in -mm which might be from Nadia.Derbey@xxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
