---

yaml --- r: 262333 b: refs/heads/master c: 298507d h: refs/heads/master i: 262331: 22a8499 v: v3
git-mirror · Aug 4, 2011 · 8773eaa · 8773eaa
1 parent ace5170
commit 8773eaa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33a30ed4bdccd95ed84a1a20c1fef8ac89788ce5
+refs/heads/master: 298507d4d2cff2248e84afcf646b697301294442
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
@@ -304,6 +304,9 @@ void exit_shm(struct task_struct *task)
 {
 	struct ipc_namespace *ns = task->nsproxy->ipc_ns;
 
+	if (shm_ids(ns).in_use == 0)
+		return;
+
 	/* Destroy all already created segments, but not mapped yet */
 	down_write(&shm_ids(ns).rw_mutex);
 	if (shm_ids(ns).in_use)