[PATCH 06/06] This is a trivial patch that changes all the calls to casted ipc_findkey() into calls to static inline routines that do the cast themselves. Signed-off-by: Nadia Derbey --- ipc/msg.c | 8 +++++++- ipc/sem.c | 8 +++++++- ipc/shm.c | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) Index: linux-2.6.21/ipc/msg.c =================================================================== --- linux-2.6.21.orig/ipc/msg.c 2007-06-07 15:18:32.000000000 +0200 +++ linux-2.6.21/ipc/msg.c 2007-06-07 15:43:24.000000000 +0200 @@ -153,6 +153,12 @@ static inline struct msg_queue *msg_lock return (struct msg_queue *) ipc_lock(&msg_ids(ns), id, chk); } +static inline struct msg_queue *msg_findkey(struct ipc_namespace *ns, + key_t key) +{ + return (struct msg_queue *) ipc_findkey(&msg_ids(ns), key); +} + static inline void msg_rmid(struct ipc_namespace *ns, struct msg_queue *s) { ipc_rmid(&msg_ids(ns), &s->q_perm); @@ -286,7 +292,7 @@ asmlinkage long sys_msgget(key_t key, in if (key == IPC_PRIVATE) ret = newque(ns, key, msgflg); else { - msq = (struct msg_queue *) ipc_findkey(&msg_ids(ns), key); + msq = msg_findkey(ns, key); if (msq == NULL) { /* key not used */ if (!(msgflg & IPC_CREAT)) Index: linux-2.6.21/ipc/sem.c =================================================================== --- linux-2.6.21.orig/ipc/sem.c 2007-06-07 15:19:21.000000000 +0200 +++ linux-2.6.21/ipc/sem.c 2007-06-07 15:45:11.000000000 +0200 @@ -192,6 +192,12 @@ static inline struct sem_array *sem_lock return (struct sem_array *) ipc_lock(&sem_ids(ns), id, chk); } +static inline struct sem_array *sem_findkey(struct ipc_namespace *ns, + key_t key) +{ + return (struct sem_array *) ipc_findkey(&sem_ids(ns), key); +} + static inline void sem_rmid(struct ipc_namespace *ns, struct sem_array *s) { ipc_rmid(&sem_ids(ns), &s->sem_perm); @@ -295,7 +301,7 @@ asmlinkage long sys_semget (key_t key, i if (key == IPC_PRIVATE) { err = newary(ns, key, nsems, semflg); } else { - sma = (struct sem_array *) ipc_findkey(&sem_ids(ns), key); + sma = sem_findkey(ns, key); if (sma == NULL) { /* key not used */ if (!(semflg & IPC_CREAT)) Index: linux-2.6.21/ipc/shm.c =================================================================== --- linux-2.6.21.orig/ipc/shm.c 2007-06-07 15:20:20.000000000 +0200 +++ linux-2.6.21/ipc/shm.c 2007-06-07 15:46:40.000000000 +0200 @@ -155,6 +155,12 @@ static inline struct shmid_kernel *shm_l return (struct shmid_kernel *) ipc_lock(&shm_ids(ns), id, chk); } +static inline struct shmid_kernel *shm_findkey(struct ipc_namespace *ns, + key_t key) +{ + return (struct shmid_kernel *) ipc_findkey(&shm_ids(ns), key); +} + static inline void shm_rmid(struct ipc_namespace *ns, struct shmid_kernel *s) { ipc_rmid(&shm_ids(ns), &s->shm_perm); @@ -430,7 +436,7 @@ asmlinkage long sys_shmget (key_t key, s if (key == IPC_PRIVATE) { err = newseg(ns, key, shmflg, size); } else { - shp = (struct shmid_kernel *) ipc_findkey(&shm_ids(ns), key); + shp = shm_findkey(ns, key); if (shp == NULL) { if (!(shmflg & IPC_CREAT)) err = -ENOENT; -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/