diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 17:04:00 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 17:04:00 +0100 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /fs/mpage.c | |
| parent | [CIFS] fix warning in cifs_spnego.c (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-f315ccb3e679f271583f2a4f463ad9b65665b751.tar.xz linux-f315ccb3e679f271583f2a4f463ad9b65665b751.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/mpage.c')
| -rw-r--r-- | fs/mpage.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/mpage.c b/fs/mpage.c index d54f8f897224..5df564366f36 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); @@ -571,8 +569,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); } /* |