Skip to content

Commit

Permalink
ipc: introduce the ipcid_to_idx macro
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nadia Derbey authored and Linus Torvalds committed Oct 19, 2007
1 parent 03f02c7 commit ce621f5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ipc/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions ipc/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);
Expand Down

0 comments on commit ce621f5

Please sign in to comment.