From 0b486ef4ff6f1ec388e2f33f670d036a2f9c679d Mon Sep 17 00:00:00 2001
From: Michal Hocko <mhocko@suse.cz>
Date: Thu, 26 May 2011 16:25:28 -0700
Subject: [PATCH] --- yaml --- r: 252036 b: refs/heads/master c:
 39cc98f1f8aa949afeea89f424c7494b0785d7da h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/mm/memcontrol.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c20ae73174a8..641a6f1d06bf 100644
--- 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
index e41a6c26f1e7..fc62c714f3b6 100644
--- 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);
 		}