1 files changed, 4 insertions, 3 deletions

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 2bfbfb87123a..267b1fe41844 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -948,9 +948,10 @@ start_over:
                         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);