Merge branch 'xfs-writepage-rework-4.6' into for-next

diff --cc fs/xfs/xfs_aops.c
index 14ac982,b125f90..75a39a8
--- 1/fs/xfs/xfs_aops.c
--- 2/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@@ -36,10 -36,17 +36,21 @@@
  #include <linux/pagevec.h>
  #include <linux/writeback.h>
  
 +/* flags for direct write completions */
 +#define XFS_DIO_FLAG_UNWRITTEN        (1 << 0)
 +#define XFS_DIO_FLAG_APPEND   (1 << 1)
 +
+ /*
+  * structure owned by writepages passed to individual writepage calls
+  */
+ struct xfs_writepage_ctx {
+       struct xfs_bmbt_irec    imap;
+       bool                    imap_valid;
+       unsigned int            io_type;
+       struct xfs_ioend        *ioend;
+       sector_t                last_block;
+ };
+ 
  void
  xfs_count_page_state(
        struct page             *page,