aboutsummaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
Diffstat (limited to 'ipc')
-rw-r--r--ipc/shm.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index a0ed957cefc9..2821cdf93adb 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -167,17 +167,6 @@ static inline void shm_lock_by_ptr(struct shmid_kernel *ipcp)
167 ipc_lock_object(&ipcp->shm_perm); 167 ipc_lock_object(&ipcp->shm_perm);
168} 168}
169 169
170static inline struct shmid_kernel *shm_lock_check(struct ipc_namespace *ns,
171 int id)
172{
173 struct kern_ipc_perm *ipcp = ipc_lock_check(&shm_ids(ns), id);
174
175 if (IS_ERR(ipcp))
176 return (struct shmid_kernel *)ipcp;
177
178 return container_of(ipcp, struct shmid_kernel, shm_perm);
179}
180
181static inline void shm_rmid(struct ipc_namespace *ns, struct shmid_kernel *s) 170static inline void shm_rmid(struct ipc_namespace *ns, struct shmid_kernel *s)
182{ 171{
183 ipc_rmid(&shm_ids(ns), &s->shm_perm); 172 ipc_rmid(&shm_ids(ns), &s->shm_perm);