From: Dave Chinner <david@fromorbit.com>
Date: Wed, 30 Nov 2016 01:49:38 +0000 (+1100)
Subject: Merge branch 'xfs-4.10-misc-fixes-2' into iomap-4.10-directio
X-Git-Tag: v4.10-rc1~104^2~2^2~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e3df41f97847f60c3808b39dee1adcb72b3d4646;p=karo-tx-linux.git

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

e3df41f97847f60c3808b39dee1adcb72b3d4646
diff --cc include/linux/iomap.h
index b9e7b8ec8c1d,7892f55a1866..f185156de74d
--- a/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 {
  	/*