[AVR32] Use ARRAY_SIZE macro when appropriate

[sfrench/cifs-2.6.git] / mm / page_io.c

diff --git a/mm/page_io.c b/mm/page_io.c
index 330e00d6db00d37dd6ebd8a21ba15f66d33ad789..dbffec0d78c98407737ac544cb2ea5ad17a9c7c2 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -52,14 +52,29 @@ static int end_swap_bio_write(struct bio *bio, unsigned int bytes_done, int err)
        if (bio->bi_size)
                return 1;
 
-       if (!uptodate)
+       if (!uptodate) {
                SetPageError(page);
+               /*
+                * We failed to write the page out to swap-space.
+                * Re-dirty the page in order to avoid it being reclaimed.
+                * Also print a dire warning that things will go BAD (tm)
+                * very quickly.
+                *
+                * Also clear PG_reclaim to avoid rotate_reclaimable_page()
+                */
+               set_page_dirty(page);
+               printk(KERN_ALERT "Write-error on swap-device (%u:%u:%Lu)\n",
+                               imajor(bio->bi_bdev->bd_inode),
+                               iminor(bio->bi_bdev->bd_inode),
+                               (unsigned long long)bio->bi_sector);
+               ClearPageReclaim(page);
+       }
        end_page_writeback(page);
        bio_put(bio);
        return 0;
 }
 
-static int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err)
+int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err)
 {
        const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
        struct page *page = bio->bi_io_vec[0].bv_page;
@@ -70,6 +85,10 @@ static int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err)
        if (!uptodate) {
                SetPageError(page);
                ClearPageUptodate(page);
+               printk(KERN_ALERT "Read-error on swap-device (%u:%u:%Lu)\n",
+                               imajor(bio->bi_bdev->bd_inode),
+                               iminor(bio->bi_bdev->bd_inode),
+                               (unsigned long long)bio->bi_sector);
        } else {
                SetPageUptodate(page);
        }
@@ -91,7 +110,8 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
                unlock_page(page);
                goto out;
        }
-       bio = get_swap_bio(GFP_NOIO, page->private, page, end_swap_bio_write);
+       bio = get_swap_bio(GFP_NOIO, page_private(page), page,
+                               end_swap_bio_write);
        if (bio == NULL) {
                set_page_dirty(page);
                unlock_page(page);
@@ -100,7 +120,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
        }
        if (wbc->sync_mode == WB_SYNC_ALL)
                rw |= (1 << BIO_RW_SYNC);
-       inc_page_state(pswpout);
+       count_vm_event(PSWPOUT);
        set_page_writeback(page);
        unlock_page(page);
        submit_bio(rw, bio);
@@ -115,46 +135,15 @@ int swap_readpage(struct file *file, struct page *page)
 
        BUG_ON(!PageLocked(page));
        ClearPageUptodate(page);
-       bio = get_swap_bio(GFP_KERNEL, page->private, page, end_swap_bio_read);
+       bio = get_swap_bio(GFP_KERNEL, page_private(page), page,
+                               end_swap_bio_read);
        if (bio == NULL) {
                unlock_page(page);
                ret = -ENOMEM;
                goto out;
        }
-       inc_page_state(pswpin);
+       count_vm_event(PSWPIN);
        submit_bio(READ, bio);
 out:
        return ret;
 }
-
-#ifdef CONFIG_SOFTWARE_SUSPEND
-/*
- * A scruffy utility function to read or write an arbitrary swap page
- * and wait on the I/O.  The caller must have a ref on the page.
- *
- * We use end_swap_bio_read() even for writes, because it happens to do what
- * we want.
- */
-int rw_swap_page_sync(int rw, swp_entry_t entry, struct page *page)
-{
-       struct bio *bio;
-       int ret = 0;
-
-       lock_page(page);
-
-       bio = get_swap_bio(GFP_KERNEL, entry.val, page, end_swap_bio_read);
-       if (bio == NULL) {
-               unlock_page(page);
-               ret = -ENOMEM;
-               goto out;
-       }
-
-       submit_bio(rw | (1 << BIO_RW_SYNC), bio);
-       wait_on_page_locked(page);
-
-       if (!PageUptodate(page) || PageError(page))
-               ret = -EIO;
-out:
-       return ret;
-}
-#endif