---

yaml --- r: 252036 b: refs/heads/master c: 39cc98f h: refs/heads/master v: v3
git-mirror · May 27, 2011 · 0b486ef · 0b486ef
1 parent c55bf61
commit 0b486ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d149e3b25d7c5f33de9aa866303926fa53535aa7
+refs/heads/master: 39cc98f1f8aa949afeea89f424c7494b0785d7da
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -3348,10 +3348,9 @@ unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
 				 */
 				next_mz =
 				__mem_cgroup_largest_soft_limit_node(mctz);
-				if (next_mz == mz) {
+				if (next_mz == mz)
 					css_put(&next_mz->mem->css);
-					next_mz = NULL;
-				} else /* next_mz == NULL or other memcg */
+				else /* next_mz == NULL or other memcg */
 					break;
 			} while (1);
 		}