From: Vasiliy Kulikov <segoon@openwall.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Oleg Nesterov <oleg@redhat.com>,
Manuel Lauss <manuel.lauss@googlemail.com>,
Richard Weinberger <richard@nod.at>,
"Serge E. Hallyn" <serge.hallyn@canonical.com>,
Marc Zyngier <marc.zyngier@arm.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH] shm: fix wrong tests
Date: Wed, 3 Aug 2011 22:26:55 +0400 [thread overview]
Message-ID: <20110803182655.GA2865@albatros> (raw)
In-Reply-To: <20110803182417.GA2510@albatros>
The patch 4c677e2eefdba9c5bfc4474e2e9 introduced a copy-paste bug.
Due to the bug cycle optimizations were disabled.
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
---
ipc/shm.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ipc/shm.c b/ipc/shm.c
index bf46636..4e3c883 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);
}
--
1.7.0.4
next prev parent reply other threads:[~2011-08-03 18:27 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-03 14:04 + shm-fix-a-race-between-shm_exit-and-shm_init.patch added to -mm tree Oleg Nesterov
2011-08-03 18:24 ` Vasiliy Kulikov
2011-08-03 18:26 ` Vasiliy Kulikov [this message]
2011-08-03 18:28 ` [PATCH] shm: optimize exit_shm() Vasiliy Kulikov
2011-08-03 19:08 ` Manuel Lauss
2011-08-03 19:16 ` Vasiliy Kulikov
2011-08-03 19:29 ` Oleg Nesterov
2011-08-03 19:41 ` Vasiliy Kulikov
2011-08-03 19:43 ` Oleg Nesterov
2011-08-03 19:21 ` Oleg Nesterov
2011-08-03 19:34 ` Vasiliy Kulikov
2011-08-03 19:39 ` Oleg Nesterov
2011-08-03 19:18 ` + shm-fix-a-race-between-shm_exit-and-shm_init.patch added to -mm tree Oleg Nesterov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110803182655.GA2865@albatros \
--to=segoon@openwall.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manuel.lauss@googlemail.com \
--cc=marc.zyngier@arm.com \
--cc=oleg@redhat.com \
--cc=richard@nod.at \
--cc=serge.hallyn@canonical.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox