---

yaml --- r: 176266 b: refs/heads/master c: 7b51159 h: refs/heads/master v: v3
git-mirror · Dec 15, 2009 · dd69512 · dd69512
1 parent 436df9e
commit dd69512
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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;