swap: remove remnants of polling from read_swap_cache_async

[linux-2.6-block.git] / mm / swap_state.c

diff --git a/mm/swap_state.c b/mm/swap_state.c
index d157862ba0a6981894058c13d9c3526e8e652b78..01f15139b7d9e52b4b4a882b130bceffc7d4be98 100644 (file)
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -526,15 +526,14 @@ fail_put_swap:
  */
 struct page *read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
                                   struct vm_area_struct *vma,
-                                  unsigned long addr, bool do_poll,
-                                  struct swap_iocb **plug)
+                                  unsigned long addr, struct swap_iocb **plug)
 {
        bool page_was_allocated;
        struct page *retpage = __read_swap_cache_async(entry, gfp_mask,
                        vma, addr, &page_was_allocated);
 
        if (page_was_allocated)
-               swap_readpage(retpage, do_poll, plug);
+               swap_readpage(retpage, false, plug);
 
        return retpage;
 }
@@ -629,7 +628,7 @@ struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask,
        struct swap_info_struct *si = swp_swap_info(entry);
        struct blk_plug plug;
        struct swap_iocb *splug = NULL;
-       bool do_poll = true, page_allocated;
+       bool page_allocated;
        struct vm_area_struct *vma = vmf->vma;
        unsigned long addr = vmf->address;
 
@@ -637,7 +636,6 @@ struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask,
        if (!mask)
                goto skip;
 
-       do_poll = false;
        /* Read a page_cluster sized and aligned cluster around offset. */
        start_offset = offset & ~mask;
        end_offset = offset | mask;
@@ -669,7 +667,7 @@ struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask,
        lru_add_drain();        /* Push any new pages onto the LRU now */
 skip:
        /* The page was likely read above, so no need for plugging here */
-       return read_swap_cache_async(entry, gfp_mask, vma, addr, do_poll, NULL);
+       return read_swap_cache_async(entry, gfp_mask, vma, addr, NULL);
 }
 
 int init_swap_address_space(unsigned int type, unsigned long nr_pages)
@@ -837,7 +835,7 @@ static struct page *swap_vma_readahead(swp_entry_t fentry, gfp_t gfp_mask,
 skip:
        /* The page was likely read above, so no need for plugging here */
        return read_swap_cache_async(fentry, gfp_mask, vma, vmf->address,
-                                    ra_info.win == 1, NULL);
+                                    NULL);
 }
 
 /**