[merged] rmap-simplify-try_to_unmap_file.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     rmap: simplify try_to_unmap_file()
has been removed from the -mm tree.  Its filename was
     rmap-simplify-try_to_unmap_file.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: rmap: simplify try_to_unmap_file()
From: Huang Shijie <shijie8@xxxxxxxxx>

Just simplify the code when `mlocked' is true.

Signed-off-by: Huang Shijie <shijie8@xxxxxxxxx>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/rmap.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff -puN mm/rmap.c~rmap-simplify-try_to_unmap_file mm/rmap.c
--- a/mm/rmap.c~rmap-simplify-try_to_unmap_file
+++ a/mm/rmap.c
@@ -1103,13 +1103,10 @@ static int try_to_unmap_file(struct page
 		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;
 
_

Patches currently in -mm which might be from shijie8@xxxxxxxxx are

origin.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux