Merge branch 'xfs-4.10-misc-fixes-2' into iomap-4.10-directio

diff --cc fs/iomap.c
Simple merge

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

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

diff --cc include/linux/iomap.h
index b9e7b8ec8c1dbb13e67900a3633d0cc596d4dc86,7892f55a1866db26d5c4edabf69a59606a2efa3f..f185156de74d8270bf931cda18c46f7dd918f294
--- 1/include/linux/iomap.h
--- 2/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@@ -42,9 -46,9 +46,10 @@@ struct iomap 
  /*
   * Flags for iomap_begin / iomap_end.  No flag implies a read.
   */
- #define IOMAP_WRITE           (1 << 0)
- #define IOMAP_ZERO            (1 << 1)
+ #define IOMAP_WRITE           (1 << 0) /* writing, must allocate blocks */
+ #define IOMAP_ZERO            (1 << 1) /* zeroing operation, may skip holes */
+ #define IOMAP_REPORT          (1 << 2) /* report extent status, e.g. FIEMAP */
 +#define IOMAP_FAULT           (1 << 3) /* mapping for page fault */
  
  struct iomap_ops {
        /*