aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorHuang Shijie <shijie8@gmail.com>2009-12-14 20:58:51 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-15 11:53:16 -0500
commit7b51159405272157123ea8e0ef9b63c731dbfb48 (patch)
treeb483123483f3a3aba8b46db3150a76b5546f42c8 /mm
parent8051be5e614f3e3feccbe9e06b50e0b889740a93 (diff)
rmap: simplify try_to_unmap_file()
Just simplify the code when `mlocked' is true. Signed-off-by: Huang Shijie <shijie8@gmail.com> Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/rmap.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/mm/rmap.c b/mm/rmap.c
index 265d529905a7..e032d96fd64e 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1103,13 +1103,10 @@ static int try_to_unmap_file(struct page *page, enum ttu_flags flags)
1103 if (ret == SWAP_MLOCK) { 1103 if (ret == SWAP_MLOCK) {
1104 mlocked = try_to_mlock_page(page, vma); 1104 mlocked = try_to_mlock_page(page, vma);
1105 if (mlocked) 1105 if (mlocked)
1106 break; /* stop if actually mlocked page */ 1106 goto out; /* stop if actually mlocked page */
1107 } 1107 }
1108 } 1108 }
1109 1109
1110 if (mlocked)
1111 goto out;
1112
1113 if (list_empty(&mapping->i_mmap_nonlinear)) 1110 if (list_empty(&mapping->i_mmap_nonlinear))
1114 goto out; 1111 goto out;
1115 1112