2.6.25-rc7

 fs

diff --git a/fs/mpage.c b/fs/mpage.c
index d54f8f8..235e4d3 100644
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -276,9 +276,7 @@ do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages,
    }
 
    if (first_hole != blocks_per_page) {
-      zero_user_page(page, first_hole << blkbits,
-            PAGE_CACHE_SIZE - (first_hole << blkbits),
-            KM_USER0);
+      zero_user_segment(page, first_hole << blkbits, PAGE_CACHE_SIZE);
       if (first_hole == 0) {
          SetPageUptodate(page);
          unlock_page(page);
@@ -327,16 +325,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.
  *
@@ -362,6 +356,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.
  *
@@ -571,8 +566,7 @@ page_is_mapped:
 
       if (page->index > end_index || !offset)
          goto confused;
-      zero_user_page(page, offset, PAGE_CACHE_SIZE - offset,
-            KM_USER0);
+      zero_user_segment(page, offset, PAGE_CACHE_SIZE);
    }
 
    /*
@@ -659,9 +653,7 @@ out:
 }
 
 /**
- * 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.