1 files changed, 11 insertions, 9 deletions

diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
index ad87cb01299b..00e9ccde8e42 100644
--- a/fs/ntfs/aops.c
+++ b/fs/ntfs/aops.c
@@ -87,13 +87,17 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
                 /* Check for the current buffer head overflowing. */
                 if (unlikely(file_ofs + bh->b_size > init_size)) {
                         int ofs;
+                        void *kaddr;
 
                         ofs = 0;
                         if (file_ofs < init_size)
                                 ofs = init_size - file_ofs;
                         local_irq_save(flags);
-                        zero_user_page(page, bh_offset(bh) + ofs,
-                                         bh->b_size - ofs, KM_BIO_SRC_IRQ);
+                        kaddr = kmap_atomic(page, KM_BIO_SRC_IRQ);
+                        memset(kaddr + bh_offset(bh) + ofs, 0,
+                                        bh->b_size - ofs);
+                        flush_dcache_page(page);
+                        kunmap_atomic(kaddr, KM_BIO_SRC_IRQ);
                         local_irq_restore(flags);
                 }
         } else {
@@ -334,7 +338,7 @@ handle_hole:
                 bh->b_blocknr = -1UL;
                 clear_buffer_mapped(bh);
 handle_zblock:
-                zero_user_page(page, i * blocksize, blocksize, KM_USER0);
+                zero_user(page, i * blocksize, blocksize);
                 if (likely(!err))
                         set_buffer_uptodate(bh);
         } while (i++, iblock++, (bh = bh->b_this_page) != head);
@@ -410,7 +414,7 @@ retry_readpage:
         /* Is the page fully outside i_size? (truncate in progress) */
         if (unlikely(page->index >= (i_size + PAGE_CACHE_SIZE - 1) >>
                         PAGE_CACHE_SHIFT)) {
-                zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+                zero_user(page, 0, PAGE_CACHE_SIZE);
                 ntfs_debug("Read outside i_size - truncated?");
                 goto done;
         }
@@ -459,7 +463,7 @@ retry_readpage:
          * ok to ignore the compressed flag here.
          */
         if (unlikely(page->index > 0)) {
-                zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+                zero_user(page, 0, PAGE_CACHE_SIZE);
                 goto done;
         }
         if (!NInoAttr(ni))
@@ -788,8 +792,7 @@ lock_retry_remap:
                 if (err == -ENOENT || lcn == LCN_ENOENT) {
                         bh->b_blocknr = -1;
                         clear_buffer_dirty(bh);
-                        zero_user_page(page, bh_offset(bh), blocksize,
-                                        KM_USER0);
+                        zero_user(page, bh_offset(bh), blocksize);
                         set_buffer_uptodate(bh);
                         err = 0;
                         continue;
@@ -1414,8 +1417,7 @@ retry_writepage:
                 if (page->index >= (i_size >> PAGE_CACHE_SHIFT)) {
                         /* The page straddles i_size. */
                         unsigned int ofs = i_size & ~PAGE_CACHE_MASK;
-                        zero_user_page(page, ofs, PAGE_CACHE_SIZE - ofs,
-                                        KM_USER0);
+                        zero_user_segment(page, ofs, PAGE_CACHE_SIZE);
                 }
                 /* Handle mst protected attributes. */
                 if (NInoMstProtected(ni))