- patches.arch/x86_mce_intel_decode_physical_address.patch:

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

diff --git a/mm/page_io.c b/mm/page_io.c
index acc711f..e0c6faf 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -111,13 +111,6 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
                return ret;
        }
 
-       if (preswap_put(page) == 1) {
-               set_page_writeback(page);
-               unlock_page(page);
-               end_page_writeback(page);
-               goto out;
-       }
-
        bio = get_swap_bio(GFP_NOIO, page, end_swap_bio_write);
        if (bio == NULL) {
                set_page_dirty(page);
@@ -186,12 +179,6 @@ int swap_readpage(struct page *page)
                return ret;
        }
 
-       if (preswap_get(page) == 1) {
-               SetPageUptodate(page);
-               unlock_page(page);
-               goto out;
-       }
-
        bio = get_swap_bio(GFP_KERNEL, page, end_swap_bio_read);
        if (bio == NULL) {
                unlock_page(page);