swap: make each swap partition have one address_space

[karo-tx-linux.git] / mm / swapfile.c

diff --git a/mm/swapfile.c b/mm/swapfile.c
index e97a0e5aea912cf0c0109164811d650cc0b2219e..e51864e6fe8b0b21173f7f77bbfede8ea405aec2 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -79,7 +79,7 @@ __try_to_reclaim_swap(struct swap_info_struct *si, unsigned long offset)
        struct page *page;
        int ret = 0;
 
-       page = find_get_page(&swapper_space, entry.val);
+       page = find_get_page(swap_address_space(entry), entry.val);
        if (!page)
                return 0;
        /*
@@ -699,7 +699,8 @@ int free_swap_and_cache(swp_entry_t entry)
        p = swap_info_get(entry);
        if (p) {
                if (swap_entry_free(p, entry, 1) == SWAP_HAS_CACHE) {
-                       page = find_get_page(&swapper_space, entry.val);
+                       page = find_get_page(swap_address_space(entry),
+                                               entry.val);
                        if (page && !trylock_page(page)) {
                                page_cache_release(page);
                                page = NULL;