diff --git a/[refs] b/[refs]
index c8f1470dc2b8..87eb82b771d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b5ffa49d4bbb8ca4c41c094261660264f16bd20
+refs/heads/master: 5a0dc7365c240795bf190766eba7a27600be3b3e
diff --git a/trunk/fs/ext4/page-io.c b/trunk/fs/ext4/page-io.c
index 7ce1d0b19c94..7e106c810c62 100644
--- a/trunk/fs/ext4/page-io.c
+++ b/trunk/fs/ext4/page-io.c
@@ -385,6 +385,18 @@ int ext4_bio_write_page(struct ext4_io_submit *io,
 
 		block_end = block_start + blocksize;
 		if (block_start >= len) {
+			/*
+			 * Comments copied from block_write_full_page_endio:
+			 *
+			 * The page straddles i_size.  It must be zeroed out on
+			 * each and every writepage invocation because it may
+			 * be mmapped.  "A file is mapped in multiples of the
+			 * page size.  For a file that is not a multiple of
+			 * the  page size, the remaining memory is zeroed when
+			 * mapped, and writes to that region are not written
+			 * out to the file."
+			 */
+			zero_user_segment(page, block_start, block_end);
 			clear_buffer_dirty(bh);
 			set_buffer_uptodate(bh);
 			continue;