From dd69512c0df24ddc281f259c70adcd279571cd41 Mon Sep 17 00:00:00 2001
From: Huang Shijie <shijie8@gmail.com>
Date: Mon, 14 Dec 2009 17:58:51 -0800
Subject: [PATCH] --- yaml --- r: 176266 b: refs/heads/master c:
 7b51159405272157123ea8e0ef9b63c731dbfb48 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 22d61e6b3604..b6ff5a2d2a16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8051be5e614f3e3feccbe9e06b50e0b889740a93
+refs/heads/master: 7b51159405272157123ea8e0ef9b63c731dbfb48
diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c
index 265d529905a7..e032d96fd64e 100644
--- a/trunk/mm/rmap.c
+++ b/trunk/mm/rmap.c
@@ -1103,13 +1103,10 @@ static int try_to_unmap_file(struct page *page, enum ttu_flags flags)
 		if (ret == SWAP_MLOCK) {
 			mlocked = try_to_mlock_page(page, vma);
 			if (mlocked)
-				break;  /* stop if actually mlocked page */
+				goto out;  /* stop if actually mlocked page */
 		}
 	}
 
-	if (mlocked)
-		goto out;
-
 	if (list_empty(&mapping->i_mmap_nonlinear))
 		goto out;