1 files changed, 10 insertions, 5 deletions

diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
index 7b54461695e2..f3cc4ab20ba0 100644
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
@@ -249,7 +249,7 @@ xfs_map_blocks(
         return -error;
 }
 
-STATIC inline int
+STATIC_INLINE int
 xfs_iomap_valid(
         xfs_iomap_t             *iomapp,
         loff_t                  offset)
@@ -1283,13 +1283,18 @@ __xfs_get_blocks(
         bh_result->b_bdev = iomap.iomap_target->bt_bdev;
 
         /*
-         * If we previously allocated a block out beyond eof and we are
-         * now coming back to use it then we will need to flag it as new
-         * even if it has a disk address.
+         * If we previously allocated a block out beyond eof and we are now
+         * coming back to use it then we will need to flag it as new even if it
+         * has a disk address.
+         *
+         * With sub-block writes into unwritten extents we also need to mark
+         * the buffer as new so that the unwritten parts of the buffer gets
+         * correctly zeroed.
          */
         if (create &&
             ((!buffer_mapped(bh_result) && !buffer_uptodate(bh_result)) ||
-             (offset >= i_size_read(inode)) || (iomap.iomap_flags & IOMAP_NEW)))
+             (offset >= i_size_read(inode)) ||
+             (iomap.iomap_flags & (IOMAP_NEW|IOMAP_UNWRITTEN))))
                 set_buffer_new(bh_result);
 
         if (iomap.iomap_flags & IOMAP_DELAY) {