1 files changed, 5 insertions, 0 deletions

diff --git a/mm/swap_state.c b/mm/swap_state.c
index 4c5ff7f284d9..c85b5590cccd 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/pagemap.h>
 #include <linux/backing-dev.h>
+#include <linux/blkdev.h>
 #include <linux/pagevec.h>
 #include <linux/migrate.h>
 #include <linux/page_cgroup.h>
@@ -376,6 +377,7 @@ struct page *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask,
         unsigned long offset = swp_offset(entry);
         unsigned long start_offset, end_offset;
         unsigned long mask = (1UL << page_cluster) - 1;
+        struct blk_plug plug;
 
         /* Read a page_cluster sized and aligned cluster around offset. */
         start_offset = offset & ~mask;
@@ -383,6 +385,7 @@ struct page *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask,
         if (!start_offset)      /* First page is swap header. */
                 start_offset++;
 
+        blk_start_plug(&plug);
         for (offset = start_offset; offset <= end_offset ; offset++) {
                 /* Ok, do the async read-ahead now */
                 page = read_swap_cache_async(swp_entry(swp_type(entry), offset),
@@ -391,6 +394,8 @@ struct page *swapin_readahead(swp_entry_t entry, gfp_t gfp_mask,
                         continue;
                 page_cache_release(page);
         }
+        blk_finish_plug(&plug);
+
         lru_add_drain();        /* Push any new pages onto the LRU now */
         return read_swap_cache_async(entry, gfp_mask, vma, addr);
 }