From: Huang Ying <[email protected]>

It's hard to write a whole transparent huge page (THP) to a file
backed swap device during swapping out and the file backed swap device
isn't very popular.  So the huge cluster allocation for the file
backed swap device is disabled.

Signed-off-by: "Huang, Ying" <[email protected]>
Cc: Johannes Weiner <[email protected]>
Cc: Minchan Kim <[email protected]>
Cc: Hugh Dickins <[email protected]>
Cc: Shaohua Li <[email protected]>
Cc: Rik van Riel <[email protected]>
---
 mm/swapfile.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mm/swapfile.c b/mm/swapfile.c
index c5d2ab1416a2..d3329b209d12 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -948,9 +948,10 @@ int get_swap_pages(int n_goal, bool cluster, swp_entry_t 
swp_entries[])
                        spin_unlock(&si->lock);
                        goto nextsi;
                }
-               if (cluster)
-                       n_ret = swap_alloc_cluster(si, swp_entries);
-               else
+               if (cluster) {
+                       if (!(si->flags & SWP_FILE))
+                               n_ret = swap_alloc_cluster(si, swp_entries);
+               } else
                        n_ret = scan_swap_map_slots(si, SWAP_HAS_CACHE,
                                                    n_goal, swp_entries);
                spin_unlock(&si->lock);
-- 
2.11.0

Reply via email to