swapin_readahead: move and rearrange args

[linux-2.6-omap-h63xx.git] / mm / shmem.c

diff --git a/mm/shmem.c b/mm/shmem.c
index 88c6685f16b715b00378fc26cf7d7b9a43dd79bd..3a22a8f793311b4759005d8f1ea830087a0e32ba 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1036,8 +1036,7 @@ static struct page *shmem_swapin(struct shmem_inode_info *info,
        pvma.vm_pgoff = idx;
        pvma.vm_ops = NULL;
        pvma.vm_policy = mpol_shared_policy_lookup(&info->policy, idx);
-       swapin_readahead(entry, 0, &pvma);
-       page = read_swap_cache_async(entry, &pvma, 0);
+       page = swapin_readahead(entry, &pvma, 0);
        mpol_free(pvma.vm_policy);
        return page;
 }
@@ -1067,8 +1066,7 @@ static inline int shmem_parse_mpol(char *value, int *policy,
 static inline struct page *
 shmem_swapin(struct shmem_inode_info *info,swp_entry_t entry,unsigned long idx)
 {
-       swapin_readahead(entry, 0, NULL);
-       return read_swap_cache_async(entry, NULL, 0);
+       return swapin_readahead(entry, NULL, 0);
 }
 
 static inline struct page *