diff options
-rw-r--r-- | ipc/msg.c | 3 | ||||
-rw-r--r-- | ipc/sem.c | 3 | ||||
-rw-r--r-- | ipc/shm.c | 4 |
3 files changed, 7 insertions, 3 deletions
@@ -1034,7 +1034,8 @@ void msg_exit_ns(struct ipc_namespace *ns) | |||
1034 | static int sysvipc_msg_proc_show(struct seq_file *s, void *it) | 1034 | static int sysvipc_msg_proc_show(struct seq_file *s, void *it) |
1035 | { | 1035 | { |
1036 | struct user_namespace *user_ns = seq_user_ns(s); | 1036 | struct user_namespace *user_ns = seq_user_ns(s); |
1037 | struct msg_queue *msq = it; | 1037 | struct kern_ipc_perm *ipcp = it; |
1038 | struct msg_queue *msq = container_of(ipcp, struct msg_queue, q_perm); | ||
1038 | 1039 | ||
1039 | seq_printf(s, | 1040 | seq_printf(s, |
1040 | "%10d %10d %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n", | 1041 | "%10d %10d %4o %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n", |
@@ -2179,7 +2179,8 @@ void exit_sem(struct task_struct *tsk) | |||
2179 | static int sysvipc_sem_proc_show(struct seq_file *s, void *it) | 2179 | static int sysvipc_sem_proc_show(struct seq_file *s, void *it) |
2180 | { | 2180 | { |
2181 | struct user_namespace *user_ns = seq_user_ns(s); | 2181 | struct user_namespace *user_ns = seq_user_ns(s); |
2182 | struct sem_array *sma = it; | 2182 | struct kern_ipc_perm *ipcp = it; |
2183 | struct sem_array *sma = container_of(ipcp, struct sem_array, sem_perm); | ||
2183 | time_t sem_otime; | 2184 | time_t sem_otime; |
2184 | 2185 | ||
2185 | /* | 2186 | /* |
@@ -1380,9 +1380,11 @@ SYSCALL_DEFINE1(shmdt, char __user *, shmaddr) | |||
1380 | static int sysvipc_shm_proc_show(struct seq_file *s, void *it) | 1380 | static int sysvipc_shm_proc_show(struct seq_file *s, void *it) |
1381 | { | 1381 | { |
1382 | struct user_namespace *user_ns = seq_user_ns(s); | 1382 | struct user_namespace *user_ns = seq_user_ns(s); |
1383 | struct shmid_kernel *shp = it; | 1383 | struct kern_ipc_perm *ipcp = it; |
1384 | struct shmid_kernel *shp; | ||
1384 | unsigned long rss = 0, swp = 0; | 1385 | unsigned long rss = 0, swp = 0; |
1385 | 1386 | ||
1387 | shp = container_of(ipcp, struct shmid_kernel, shm_perm); | ||
1386 | shm_add_rss_swap(shp, &rss, &swp); | 1388 | shm_add_rss_swap(shp, &rss, &swp); |
1387 | 1389 | ||
1388 | #if BITS_PER_LONG <= 32 | 1390 | #if BITS_PER_LONG <= 32 |