Update to 3.4-final.

[linux-flexiantxendom0-3.2.10.git] / mm / page_io.c

diff --git a/mm/page_io.c b/mm/page_io.c
index 1eccb7f..651a912 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -12,30 +12,24 @@
 
 #include <linux/mm.h>
 #include <linux/kernel_stat.h>
+#include <linux/gfp.h>
 #include <linux/pagemap.h>
 #include <linux/swap.h>
 #include <linux/bio.h>
 #include <linux/swapops.h>
 #include <linux/writeback.h>
-#include <trace/swap.h>
+#include <linux/frontswap.h>
 #include <asm/pgtable.h>
 
-DEFINE_TRACE(swap_out);
-
-static struct bio *get_swap_bio(gfp_t gfp_flags, pgoff_t index,
+static struct bio *get_swap_bio(gfp_t gfp_flags,
                                struct page *page, bio_end_io_t end_io)
 {
        struct bio *bio;
 
        bio = bio_alloc(gfp_flags, 1);
        if (bio) {
-               struct swap_info_struct *sis;
-               swp_entry_t entry = { .val = index, };
-
-               sis = get_swap_info_struct(swp_type(entry));
-               bio->bi_sector = map_swap_page(sis, swp_offset(entry)) *
-                                       (PAGE_SIZE >> 9);
-               bio->bi_bdev = sis->bdev;
+               bio->bi_sector = map_swap_page(page, &bio->bi_bdev);
+               bio->bi_sector <<= PAGE_SHIFT - 9;
                bio->bi_io_vec[0].bv_page = page;
                bio->bi_io_vec[0].bv_len = PAGE_SIZE;
                bio->bi_io_vec[0].bv_offset = 0;
@@ -105,32 +99,23 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
                unlock_page(page);
                goto out;
        }
-       bio = get_swap_bio(GFP_NOIO, page_private(page), page,
-                               end_swap_bio_write);
-       if (bio == NULL) {
-               set_page_dirty(page);
+       if (frontswap_put_page(page) == 0) {
+               set_page_writeback(page);
                unlock_page(page);
-               ret = -ENOMEM;
+               end_page_writeback(page);
                goto out;
        }
-
-#ifdef CONFIG_PRECACHE
-       set_page_writeback(page);
-       if (preswap_put(page) == 1) {
+       bio = get_swap_bio(GFP_NOIO, page, end_swap_bio_write);
+       if (bio == NULL) {
+               set_page_dirty(page);
                unlock_page(page);
-               end_page_writeback(page);
-               bio_put(bio);
+               ret = -ENOMEM;
                goto out;
        }
-#endif
-
        if (wbc->sync_mode == WB_SYNC_ALL)
-               rw |= (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG);
+               rw |= REQ_SYNC;
        count_vm_event(PSWPOUT);
-#ifndef CONFIG_PRECACHE
        set_page_writeback(page);
-#endif
-       trace_swap_out(page);
        unlock_page(page);
        submit_bio(rw, bio);
 out:
@@ -144,15 +129,12 @@ int swap_readpage(struct page *page)
 
        VM_BUG_ON(!PageLocked(page));
        VM_BUG_ON(PageUptodate(page));
-
-       if (preswap_get(page) == 1) {
+       if (frontswap_get_page(page) == 0) {
                SetPageUptodate(page);
                unlock_page(page);
                goto out;
        }
-
-       bio = get_swap_bio(GFP_KERNEL, page_private(page), page,
-                               end_swap_bio_read);
+       bio = get_swap_bio(GFP_KERNEL, page, end_swap_bio_read);
        if (bio == NULL) {
                unlock_page(page);
                ret = -ENOMEM;