lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Storing ipcs into IDRs

Browse Source 
This patch converts casts of struct kern_ipc_perm to
   . struct msg_queue
   . struct sem_array
   . struct shmid_kernel
into the equivalent container_of() macro. It improves code maintenance
because the code need not change if kern_ipc_perm is no longer at the
beginning of the containing struct.

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>
This commit is contained in:
Nadia Derbey
2007-10-18 23:40:51 -07:00
committed by Linus Torvalds
parent 023a53557e
commit 03f02c7657
4 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ipc/msg.c
View File

@@ -138,13 +138,17 @@ void __init msg_init(void)
static inline struct msg_queue *msg_lock(struct ipc_namespace *ns, int id)
{
return (struct msg_queue *) ipc_lock(&msg_ids(ns), id);
struct kern_ipc_perm *ipcp = ipc_lock(&msg_ids(ns), id);
return container_of(ipcp, struct msg_queue, q_perm);
}
static inline struct msg_queue *msg_lock_check(struct ipc_namespace *ns,
int id)
{
return (struct msg_queue *) ipc_lock_check(&msg_ids(ns), id);
struct kern_ipc_perm *ipcp = ipc_lock_check(&msg_ids(ns), id);
return container_of(ipcp, struct msg_queue, q_perm);
}
static inline void msg_rmid(struct ipc_namespace *ns, struct msg_queue *s)
@@ -274,9 +278,11 @@ static void freeque(struct ipc_namespace *ns, struct msg_queue *msq)
ipc_rcu_putref(msq);
}
static inline int msg_security(void *msq, int msgflg)
static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
{
return security_msg_queue_associate((struct msg_queue *) msq, msgflg);
struct msg_queue *msq = container_of(ipcp, struct msg_queue, q_perm);
return security_msg_queue_associate(msq, msgflg);
}
asmlinkage long sys_msgget(key_t key, int msgflg)