string: factorize skip_spaces and export it to be generally available

[safe/jmp/linux-2.6] / mm / page_io.c

diff --git a/mm/page_io.c b/mm/page_io.c
index d2f0a57..a19af95 100644 (file)
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -19,20 +19,15 @@
 #include <linux/writeback.h>
 #include <asm/pgtable.h>
 
-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;
@@ -44,14 +39,11 @@ static struct bio *get_swap_bio(gfp_t gfp_flags, pgoff_t index,
        return bio;
 }
 
-static int end_swap_bio_write(struct bio *bio, unsigned int bytes_done, int err)
+static void end_swap_bio_write(struct bio *bio, int err)
 {
        const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
        struct page *page = bio->bi_io_vec[0].bv_page;
 
-       if (bio->bi_size)
-               return 1;
-
        if (!uptodate) {
                SetPageError(page);
                /*
@@ -71,17 +63,13 @@ static int end_swap_bio_write(struct bio *bio, unsigned int bytes_done, int err)
        }
        end_page_writeback(page);
        bio_put(bio);
-       return 0;
 }
 
-static int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err)
+void end_swap_bio_read(struct bio *bio, int err)
 {
        const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
        struct page *page = bio->bi_io_vec[0].bv_page;
 
-       if (bio->bi_size)
-               return 1;
-
        if (!uptodate) {
                SetPageError(page);
                ClearPageUptodate(page);
@@ -94,7 +82,6 @@ static int end_swap_bio_read(struct bio *bio, unsigned int bytes_done, int err)
        }
        unlock_page(page);
        bio_put(bio);
-       return 0;
 }
 
 /*
@@ -106,12 +93,11 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
        struct bio *bio;
        int ret = 0, rw = WRITE;
 
-       if (remove_exclusive_swap_page(page)) {
+       if (try_to_free_swap(page)) {
                unlock_page(page);
                goto out;
        }
-       bio = get_swap_bio(GFP_NOIO, page_private(page), page,
-                               end_swap_bio_write);
+       bio = get_swap_bio(GFP_NOIO, page, end_swap_bio_write);
        if (bio == NULL) {
                set_page_dirty(page);
                unlock_page(page);
@@ -119,7 +105,7 @@ int swap_writepage(struct page *page, struct writeback_control *wbc)
                goto out;
        }
        if (wbc->sync_mode == WB_SYNC_ALL)
-               rw |= (1 << BIO_RW_SYNC);
+               rw |= (1 << BIO_RW_SYNCIO) | (1 << BIO_RW_UNPLUG);
        count_vm_event(PSWPOUT);
        set_page_writeback(page);
        unlock_page(page);
@@ -128,15 +114,14 @@ out:
        return ret;
 }
 
-int swap_readpage(struct file *file, struct page *page)
+int swap_readpage(struct page *page)
 {
        struct bio *bio;
        int ret = 0;
 
-       BUG_ON(!PageLocked(page));
-       ClearPageUptodate(page);
-       bio = get_swap_bio(GFP_KERNEL, page_private(page), page,
-                               end_swap_bio_read);
+       VM_BUG_ON(!PageLocked(page));
+       VM_BUG_ON(PageUptodate(page));
+       bio = get_swap_bio(GFP_KERNEL, page, end_swap_bio_read);
        if (bio == NULL) {
                unlock_page(page);
                ret = -ENOMEM;
@@ -147,35 +132,3 @@ int swap_readpage(struct file *file, struct page *page)
 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