Merge branch 'linux-2.6'

1 files changed, 3 insertions, 7 deletions

diff --git a/fs/direct-io.c b/fs/direct-io.c
index d9d0833444f5..8593f3dfd299 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -439,7 +439,7 @@ static int dio_bio_complete(struct dio *dio, struct bio *bio)
  * Wait on and process all in-flight BIOs.  This must only be called once
  * all bios have been issued so that the refcount can only decrease.
  * This just waits for all bios to make it through dio_bio_complete.  IO
- * errors are propogated through dio->io_error and should be propogated via
+ * errors are propagated through dio->io_error and should be propagated via
  * dio_complete().
  */
 static void dio_await_completion(struct dio *dio)
@@ -867,7 +867,6 @@ static int do_direct_IO(struct dio *dio)
 do_holes:
                         /* Handle holes */
                         if (!buffer_mapped(map_bh)) {
-                                char *kaddr;
                                 loff_t i_size_aligned;
 
                                 /* AKPM: eargh, -ENOTBLK is a hack */
@@ -888,11 +887,8 @@ do_holes:
                                         page_cache_release(page);
                                         goto out;
                                 }
-                                kaddr = kmap_atomic(page, KM_USER0);
-                                memset(kaddr + (block_in_page << blkbits),
-                                                0, 1 << blkbits);
-                                flush_dcache_page(page);
-                                kunmap_atomic(kaddr, KM_USER0);
+                                zero_user_page(page, block_in_page << blkbits,
+                                                1 << blkbits, KM_USER0);
                                 dio->block_in_file++;
                                 block_in_page++;
                                 goto next_block;