diff options
| author | Nadia Derbey <Nadia.Derbey@bull.net> | 2007-10-18 23:40:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 11:53:46 -0700 |
| commit | ce621f5ba52f30dd59aef4fb50276faee04ef9cf (patch) | |
| tree | e0260364cf8748849d37165760db6d4e4e51ed9c | |
| parent | 03f02c7657f7948ab980280c54c9366f962b1474 (diff) | |
| download | linux-stable-ce621f5ba52f30dd59aef4fb50276faee04ef9cf.tar.gz linux-stable-ce621f5ba52f30dd59aef4fb50276faee04ef9cf.tar.bz2 linux-stable-ce621f5ba52f30dd59aef4fb50276faee04ef9cf.zip | |
ipc: introduce the ipcid_to_idx macro
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@bull.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | ipc/util.c | 4 | ||||
| -rw-r--r-- | ipc/util.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ipc/util.c b/ipc/util.c index 9b0c4e7753af..c51c96f2e0cf 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -413,7 +413,7 @@ int ipcget_public(struct ipc_namespace *ns, struct ipc_ids *ids, 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 ipc64_perm *in, struct ipc_perm *out) 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 --git a/ipc/util.h b/ipc/util.h index 2a03d8cc6a01..fa7e7a07486e 100644 --- a/ipc/util.h +++ b/ipc/util.h @@ -79,6 +79,8 @@ void __init ipc_init_proc_interface(const char *path, const char *header, #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 *); |