mm: remove SWAP_MLOCK in ttu

[thirdparty/kernel/stable.git] / mm / vmscan.c

diff --git a/mm/vmscan.c b/mm/vmscan.c
index f1fd388454bd04254df86097300b395643bf3747..cfd2651966a844921c3795521a1e01414b04aa03 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -987,7 +987,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
                sc->nr_scanned++;
 
                if (unlikely(!page_evictable(page)))
-                       goto cull_mlocked;
+                       goto activate_locked;
 
                if (!sc->may_unmap && page_mapped(page))
                        goto keep_locked;
@@ -1152,8 +1152,6 @@ static unsigned long shrink_page_list(struct list_head *page_list,
                                goto activate_locked;
                        case SWAP_AGAIN:
                                goto keep_locked;
-                       case SWAP_MLOCK:
-                               goto cull_mlocked;
                        case SWAP_SUCCESS:
                                ; /* try to free the page below */
                        }
@@ -1295,20 +1293,16 @@ free_it:
                list_add(&page->lru, &free_pages);
                continue;
 
-cull_mlocked:
-               if (PageSwapCache(page))
-                       try_to_free_swap(page);
-               unlock_page(page);
-               list_add(&page->lru, &ret_pages);
-               continue;
-
 activate_locked:
                /* Not a candidate for swapping, so reclaim swap space. */
-               if (PageSwapCache(page) && mem_cgroup_swap_full(page))
+               if (PageSwapCache(page) && (mem_cgroup_swap_full(page) ||
+                                               PageMlocked(page)))
                        try_to_free_swap(page);
                VM_BUG_ON_PAGE(PageActive(page), page);
-               SetPageActive(page);
-               pgactivate++;
+               if (!PageMlocked(page)) {
+                       SetPageActive(page);
+                       pgactivate++;
+               }
 keep_locked:
                unlock_page(page);
 keep: