1 files changed, 5 insertions, 10 deletions

diff --git a/fs/mpage.c b/fs/mpage.c
index fa2441f57b41..0fb914fc2ee0 100644
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -284,11 +284,9 @@ 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_page(page, first_hole << blkbits,
+                                PAGE_CACHE_SIZE - (first_hole << blkbits),
+                                KM_USER0);
                 if (first_hole == 0) {
                         SetPageUptodate(page);
                         unlock_page(page);
@@ -576,14 +574,11 @@ page_is_mapped:
                  * 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_page(page, offset, PAGE_CACHE_SIZE - offset,
+                                KM_USER0);
         }
 
         /*