drm/radeon/kms: add hw_i2c module option
[linux-2.6.git] / fs / mpage.c
index fa2441f..598d54e 100644 (file)
@@ -6,7 +6,7 @@
  * Contains functions related to preparing and submitting BIOs which contain
  * multiple pagecache pages.
  *
- * 15May2002   akpm@zip.com.au
+ * 15May2002   Andrew Morton
  *             Initial version
  * 27Jun2002   axboe@suse.de
  *             use bio_add_page() to build bio's just the right size
  * status of that page is hard.  See end_buffer_async_read() for the details.
  * There is no point in duplicating all that complexity.
  */
-static int mpage_end_io_read(struct bio *bio, unsigned int bytes_done, int err)
+static void mpage_end_io_read(struct bio *bio, int err)
 {
        const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
        struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1;
 
-       if (bio->bi_size)
-               return 1;
-
        do {
                struct page *page = bvec->bv_page;
 
@@ -62,17 +59,13 @@ static int mpage_end_io_read(struct bio *bio, unsigned int bytes_done, int err)
                unlock_page(page);
        } while (bvec >= bio->bi_io_vec);
        bio_put(bio);
-       return 0;
 }
 
-static int mpage_end_io_write(struct bio *bio, unsigned int bytes_done, int err)
+static void mpage_end_io_write(struct bio *bio, int err)
 {
        const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
        struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1;
 
-       if (bio->bi_size)
-               return 1;
-
        do {
                struct page *page = bvec->bv_page;
 
@@ -87,7 +80,6 @@ static int mpage_end_io_write(struct bio *bio, unsigned int bytes_done, int err)
                end_page_writeback(page);
        } while (bvec >= bio->bi_io_vec);
        bio_put(bio);
-       return 0;
 }
 
 static struct bio *mpage_bio_submit(int rw, struct bio *bio)
@@ -248,7 +240,6 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages,
                                first_hole = page_block;
                        page_block++;
                        block_in_file++;
-                       clear_buffer_mapped(map_bh);
                        continue;
                }
 
@@ -284,11 +275,7 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages,
        }
 
        if (first_hole != blocks_per_page) {
-               char *kaddr = kmap_atomic(page, KM_USER0);
-               memset(kaddr + (first_hole << blkbits), 0,
-                               PAGE_CACHE_SIZE - (first_hole << blkbits));
-               flush_dcache_page(page);
-               kunmap_atomic(kaddr, KM_USER0);
+               zero_user_segment(page, first_hole << blkbits, PAGE_CACHE_SIZE);
                if (first_hole == 0) {
                        SetPageUptodate(page);
                        unlock_page(page);
@@ -319,7 +306,10 @@ alloc_new:
                goto alloc_new;
        }
 
-       if (buffer_boundary(map_bh) || (first_hole != blocks_per_page))
+       relative_block = block_in_file - *first_logical_block;
+       nblocks = map_bh->b_size >> blkbits;
+       if ((buffer_boundary(map_bh) && relative_block == nblocks) ||
+           (first_hole != blocks_per_page))
                bio = mpage_bio_submit(READ, bio);
        else
                *last_block_in_bio = blocks[blocks_per_page - 1];
@@ -337,16 +327,12 @@ confused:
 }
 
 /**
- * mpage_readpages - populate an address space with some pages, and
- *                       start reads against them.
- *
+ * mpage_readpages - populate an address space with some pages & start reads against them
  * @mapping: the address_space
  * @pages: The address of a list_head which contains the target pages.  These
  *   pages have their ->index populated and are otherwise uninitialised.
- *
  *   The page at @pages->prev has the lowest file offset, and reads should be
  *   issued in @pages->prev to @pages->next order.
- *
  * @nr_pages: The number of pages at *@pages
  * @get_block: The filesystem's block mapper function.
  *
@@ -372,6 +358,7 @@ confused:
  * So an mpage read of the first 16 blocks of an ext2 file will cause I/O to be
  * submitted in the following order:
  *     12 0 1 2 3 4 5 6 7 8 9 10 11 13 14 15 16
+ *
  * because the indirect block has to be read to get the mappings of blocks
  * 13,14,15,16.  Obviously, this impacts performance.
  *
@@ -389,31 +376,26 @@ mpage_readpages(struct address_space *mapping, struct list_head *pages,
        struct bio *bio = NULL;
        unsigned page_idx;
        sector_t last_block_in_bio = 0;
-       struct pagevec lru_pvec;
        struct buffer_head map_bh;
        unsigned long first_logical_block = 0;
 
-       clear_buffer_mapped(&map_bh);
-       pagevec_init(&lru_pvec, 0);
+       map_bh.b_state = 0;
+       map_bh.b_size = 0;
        for (page_idx = 0; page_idx < nr_pages; page_idx++) {
                struct page *page = list_entry(pages->prev, struct page, lru);
 
                prefetchw(&page->flags);
                list_del(&page->lru);
-               if (!add_to_page_cache(page, mapping,
+               if (!add_to_page_cache_lru(page, mapping,
                                        page->index, GFP_KERNEL)) {
                        bio = do_mpage_readpage(bio, page,
                                        nr_pages - page_idx,
                                        &last_block_in_bio, &map_bh,
                                        &first_logical_block,
                                        get_block);
-                       if (!pagevec_add(&lru_pvec, page))
-                               __pagevec_lru_add(&lru_pvec);
-               } else {
-                       page_cache_release(page);
                }
+               page_cache_release(page);
        }
-       pagevec_lru_add(&lru_pvec);
        BUG_ON(!list_empty(pages));
        if (bio)
                mpage_bio_submit(READ, bio);
@@ -431,7 +413,8 @@ int mpage_readpage(struct page *page, get_block_t get_block)
        struct buffer_head map_bh;
        unsigned long first_logical_block = 0;
 
-       clear_buffer_mapped(&map_bh);
+       map_bh.b_state = 0;
+       map_bh.b_size = 0;
        bio = do_mpage_readpage(bio, page, 1, &last_block_in_bio,
                        &map_bh, &first_logical_block, get_block);
        if (bio)
@@ -456,11 +439,19 @@ EXPORT_SYMBOL(mpage_readpage);
  * written, so it can intelligently allocate a suitably-sized BIO.  For now,
  * just allocate full-size (16-page) BIOs.
  */
-static struct bio *
-__mpage_writepage(struct bio *bio, struct page *page, get_block_t get_block,
-       sector_t *last_block_in_bio, int *ret, struct writeback_control *wbc,
-       writepage_t writepage_fn)
+
+struct mpage_data {
+       struct bio *bio;
+       sector_t last_block_in_bio;
+       get_block_t *get_block;
+       unsigned use_writepage;
+};
+
+static int __mpage_writepage(struct page *page, struct writeback_control *wbc,
+                     void *data)
 {
+       struct mpage_data *mpd = data;
+       struct bio *bio = mpd->bio;
        struct address_space *mapping = page->mapping;
        struct inode *inode = page->mapping->host;
        const unsigned blkbits = inode->i_blkbits;
@@ -478,6 +469,7 @@ __mpage_writepage(struct bio *bio, struct page *page, get_block_t get_block,
        int length;
        struct buffer_head map_bh;
        loff_t i_size = i_size_read(inode);
+       int ret = 0;
 
        if (page_has_buffers(page)) {
                struct buffer_head *head = page_buffers(page);
@@ -540,7 +532,7 @@ __mpage_writepage(struct bio *bio, struct page *page, get_block_t get_block,
 
                map_bh.b_state = 0;
                map_bh.b_size = 1 << blkbits;
-               if (get_block(inode, block_in_file, &map_bh, 1))
+               if (mpd->get_block(inode, block_in_file, &map_bh, 1))
                        goto confused;
                if (buffer_new(&map_bh))
                        unmap_underlying_metadata(map_bh.b_bdev,
@@ -569,27 +561,23 @@ page_is_mapped:
        if (page->index >= end_index) {
                /*
                 * The page straddles i_size.  It must be zeroed out on each
-                * and every writepage invokation because it may be mmapped.
+                * and every writepage invocation because it may be mmapped.
                 * "A file is mapped in multiples of the page size.  For a file
                 * that is not a multiple of the page size, the remaining memory
                 * is zeroed when mapped, and writes to that region are not
                 * written out to the file."
                 */
                unsigned offset = i_size & (PAGE_CACHE_SIZE - 1);
-               char *kaddr;
 
                if (page->index > end_index || !offset)
                        goto confused;
-               kaddr = kmap_atomic(page, KM_USER0);
-               memset(kaddr + offset, 0, PAGE_CACHE_SIZE - offset);
-               flush_dcache_page(page);
-               kunmap_atomic(kaddr, KM_USER0);
+               zero_user_segment(page, offset, PAGE_CACHE_SIZE);
        }
 
        /*
         * This page will go to BIO.  Do we need to send this BIO off first?
         */
-       if (bio && *last_block_in_bio != blocks[0] - 1)
+       if (bio && mpd->last_block_in_bio != blocks[0] - 1)
                bio = mpage_bio_submit(WRITE, bio);
 
 alloc_new:
@@ -646,7 +634,7 @@ alloc_new:
                                        boundary_block, 1 << blkbits);
                }
        } else {
-               *last_block_in_bio = blocks[blocks_per_page - 1];
+               mpd->last_block_in_bio = blocks[blocks_per_page - 1];
        }
        goto out;
 
@@ -654,24 +642,23 @@ confused:
        if (bio)
                bio = mpage_bio_submit(WRITE, bio);
 
-       if (writepage_fn) {
-               *ret = (*writepage_fn)(page, wbc);
+       if (mpd->use_writepage) {
+               ret = mapping->a_ops->writepage(page, wbc);
        } else {
-               *ret = -EAGAIN;
+               ret = -EAGAIN;
                goto out;
        }
        /*
         * The caller has a ref on the inode, so *mapping is stable
         */
-       mapping_set_error(mapping, *ret);
+       mapping_set_error(mapping, ret);
 out:
-       return bio;
+       mpd->bio = bio;
+       return ret;
 }
 
 /**
- * mpage_writepages - walk the list of dirty pages of the given
- * address space and writepage() all of them.
- * 
+ * mpage_writepages - walk the list of dirty pages of the given address space & writepage() all of them
  * @mapping: address space structure to write
  * @wbc: subtract the number of written pages from *@wbc->nr_to_write
  * @get_block: the filesystem's block mapper function.
@@ -688,120 +675,27 @@ out:
  * the call was made get new I/O started against them.  If wbc->sync_mode is
  * WB_SYNC_ALL then we were called for data integrity and we must wait for
  * existing IO to complete.
- *
- * If you fix this you should check generic_writepages() also!
  */
 int
 mpage_writepages(struct address_space *mapping,
                struct writeback_control *wbc, get_block_t get_block)
 {
-       struct backing_dev_info *bdi = mapping->backing_dev_info;
-       struct bio *bio = NULL;
-       sector_t last_block_in_bio = 0;
-       int ret = 0;
-       int done = 0;
-       int (*writepage)(struct page *page, struct writeback_control *wbc);
-       struct pagevec pvec;
-       int nr_pages;
-       pgoff_t index;
-       pgoff_t end;            /* Inclusive */
-       int scanned = 0;
-       int range_whole = 0;
-
-       if (wbc->nonblocking && bdi_write_congested(bdi)) {
-               wbc->encountered_congestion = 1;
-               return 0;
+       int ret;
+
+       if (!get_block)
+               ret = generic_writepages(mapping, wbc);
+       else {
+               struct mpage_data mpd = {
+                       .bio = NULL,
+                       .last_block_in_bio = 0,
+                       .get_block = get_block,
+                       .use_writepage = 1,
+               };
+
+               ret = write_cache_pages(mapping, wbc, __mpage_writepage, &mpd);
+               if (mpd.bio)
+                       mpage_bio_submit(WRITE, mpd.bio);
        }
-
-       writepage = NULL;
-       if (get_block == NULL)
-               writepage = mapping->a_ops->writepage;
-
-       pagevec_init(&pvec, 0);
-       if (wbc->range_cyclic) {
-               index = mapping->writeback_index; /* Start from prev offset */
-               end = -1;
-       } else {
-               index = wbc->range_start >> PAGE_CACHE_SHIFT;
-               end = wbc->range_end >> PAGE_CACHE_SHIFT;
-               if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
-                       range_whole = 1;
-               scanned = 1;
-       }
-retry:
-       while (!done && (index <= end) &&
-                       (nr_pages = pagevec_lookup_tag(&pvec, mapping, &index,
-                       PAGECACHE_TAG_DIRTY,
-                       min(end - index, (pgoff_t)PAGEVEC_SIZE-1) + 1))) {
-               unsigned i;
-
-               scanned = 1;
-               for (i = 0; i < nr_pages; i++) {
-                       struct page *page = pvec.pages[i];
-
-                       /*
-                        * At this point we hold neither mapping->tree_lock nor
-                        * lock on the page itself: the page may be truncated or
-                        * invalidated (changing page->mapping to NULL), or even
-                        * swizzled back from swapper_space to tmpfs file
-                        * mapping
-                        */
-
-                       lock_page(page);
-
-                       if (unlikely(page->mapping != mapping)) {
-                               unlock_page(page);
-                               continue;
-                       }
-
-                       if (!wbc->range_cyclic && page->index > end) {
-                               done = 1;
-                               unlock_page(page);
-                               continue;
-                       }
-
-                       if (wbc->sync_mode != WB_SYNC_NONE)
-                               wait_on_page_writeback(page);
-
-                       if (PageWriteback(page) ||
-                                       !clear_page_dirty_for_io(page)) {
-                               unlock_page(page);
-                               continue;
-                       }
-
-                       if (writepage) {
-                               ret = (*writepage)(page, wbc);
-                               mapping_set_error(mapping, ret);
-                       } else {
-                               bio = __mpage_writepage(bio, page, get_block,
-                                               &last_block_in_bio, &ret, wbc,
-                                               page->mapping->a_ops->writepage);
-                       }
-                       if (unlikely(ret == AOP_WRITEPAGE_ACTIVATE))
-                               unlock_page(page);
-                       if (ret || (--(wbc->nr_to_write) <= 0))
-                               done = 1;
-                       if (wbc->nonblocking && bdi_write_congested(bdi)) {
-                               wbc->encountered_congestion = 1;
-                               done = 1;
-                       }
-               }
-               pagevec_release(&pvec);
-               cond_resched();
-       }
-       if (!scanned && !done) {
-               /*
-                * We hit the last page and there is more work to be done: wrap
-                * back to the start of the file
-                */
-               scanned = 1;
-               index = 0;
-               goto retry;
-       }
-       if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0))
-               mapping->writeback_index = index;
-       if (bio)
-               mpage_bio_submit(WRITE, bio);
        return ret;
 }
 EXPORT_SYMBOL(mpage_writepages);
@@ -809,15 +703,15 @@ EXPORT_SYMBOL(mpage_writepages);
 int mpage_writepage(struct page *page, get_block_t get_block,
        struct writeback_control *wbc)
 {
-       int ret = 0;
-       struct bio *bio;
-       sector_t last_block_in_bio = 0;
-
-       bio = __mpage_writepage(NULL, page, get_block,
-                       &last_block_in_bio, &ret, wbc, NULL);
-       if (bio)
-               mpage_bio_submit(WRITE, bio);
-
+       struct mpage_data mpd = {
+               .bio = NULL,
+               .last_block_in_bio = 0,
+               .get_block = get_block,
+               .use_writepage = 0,
+       };
+       int ret = __mpage_writepage(page, wbc, &mpd);
+       if (mpd.bio)
+               mpage_bio_submit(WRITE, mpd.bio);
        return ret;
 }
 EXPORT_SYMBOL(mpage_writepage);