Merge remote-tracking branch 'xfs/for-next'

diff --cc fs/dax.c
Simple merge

diff --cc fs/direct-io.c
Simple merge

diff --cc fs/ext4/ext4.h
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ocfs2/aops.c
Simple merge

diff --cc fs/xfs/xfs_aops.c
index a9ebabfe7587bf5abbc427e1603fcf012e5ac63c,75a39a8257ee78a8f7fdf1cb473b5a91f0ec0dd4..38e6ebd72131c566e0c2a31b8ad73361fe3ff4b1
--- 1/fs/xfs/xfs_aops.c
--- 2/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@@ -1207,12 -1006,16 +1006,20 @@@ xfs_vm_writepages
        struct address_space    *mapping,
        struct writeback_control *wbc)
  {
+       struct xfs_writepage_ctx wpc = {
+               .io_type = XFS_IO_INVALID,
+       };
+       int                     ret;
+ 
        xfs_iflags_clear(XFS_I(mapping->host), XFS_ITRUNCATED);
-       return generic_writepages(mapping, wbc);
 +      if (dax_mapping(mapping))
 +              return dax_writeback_mapping_range(mapping,
 +                              xfs_find_bdev_for_inode(mapping->host), wbc);
 +
+       ret = write_cache_pages(mapping, wbc, xfs_do_writepage, &wpc);
+       if (wpc.ioend)
+               ret = xfs_submit_ioend(wbc, wpc.ioend, ret);
+       return ret;
  }
  
  /*

diff --cc fs/xfs/xfs_aops.h
Simple merge

diff --cc fs/xfs/xfs_bmap_util.c
Simple merge

diff --cc fs/xfs/xfs_export.c
Simple merge

diff --cc include/linux/fs.h
Simple merge