IPC: use ipc_buildid() directly from ipc_addid()
By continuing to consolidate a little the IPC code, each id can be built directly in ipc_addid() instead of having it built from each callers of ipc_addid() And I also remove shm_addid() in order to have, as much as possible, the same code for shm/sem/msg. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Pierre Peiffer <pierre.peiffer@bull.net> Cc: Nadia Derbey <Nadia.Derbey@bull.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
02d15c4322
commit
48dea404ed
@@ -70,7 +70,6 @@ struct msg_sender {
|
||||
#define msg_ids(ns) ((ns)->ids[IPC_MSG_IDS])
|
||||
|
||||
#define msg_unlock(msq) ipc_unlock(&(msq)->q_perm)
|
||||
#define msg_buildid(id, seq) ipc_buildid(id, seq)
|
||||
|
||||
static void freeque(struct ipc_namespace *, struct kern_ipc_perm *);
|
||||
static int newque(struct ipc_namespace *, struct ipc_params *);
|
||||
@@ -186,7 +185,6 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params)
|
||||
return id;
|
||||
}
|
||||
|
||||
msq->q_perm.id = msg_buildid(id, msq->q_perm.seq);
|
||||
msq->q_stime = msq->q_rtime = 0;
|
||||
msq->q_ctime = get_seconds();
|
||||
msq->q_cbytes = msq->q_qnum = 0;
|
||||
|
Reference in New Issue
Block a user