diff options
| author | Vasiliy Kulikov <segoon@openwall.com> | 2011-08-03 22:26:55 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 14:45:55 -1000 |
| commit | 33a30ed4bdccd95ed84a1a20c1fef8ac89788ce5 (patch) | |
| tree | aa57f9f5b958cf90ab548fc4535b9fb750489829 /ipc | |
| parent | 206506ccf04b6790d11553a0c8595d1bf65790fe (diff) | |
| download | linux-stable-33a30ed4bdccd95ed84a1a20c1fef8ac89788ce5.tar.gz linux-stable-33a30ed4bdccd95ed84a1a20c1fef8ac89788ce5.tar.bz2 linux-stable-33a30ed4bdccd95ed84a1a20c1fef8ac89788ce5.zip | |
shm: fix wrong tests
Commit 4c677e2eefdb ("shm: optimize locking and ipc_namespace getting")
introduced a copy-paste bug. Due to the bug cycle optimizations were
disabled.
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/shm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/shm.c b/ipc/shm.c index 9fb044f3b345..7efff043ffbf 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -294,7 +294,7 @@ static int shm_try_destroy_orphaned(int id, void *p, void *data) void shm_destroy_orphaned(struct ipc_namespace *ns) { down_write(&shm_ids(ns).rw_mutex); - if (&shm_ids(ns).in_use) + if (shm_ids(ns).in_use) idr_for_each(&shm_ids(ns).ipcs_idr, &shm_try_destroy_orphaned, ns); up_write(&shm_ids(ns).rw_mutex); } @@ -306,7 +306,7 @@ void exit_shm(struct task_struct *task) /* Destroy all already created segments, but not mapped yet */ down_write(&shm_ids(ns).rw_mutex); - if (&shm_ids(ns).in_use) + if (shm_ids(ns).in_use) idr_for_each(&shm_ids(ns).ipcs_idr, &shm_try_destroy_current, ns); up_write(&shm_ids(ns).rw_mutex); } |