Merge branch 'iomap-4.9-dax' into for-next

2016-10-03 09:53:59 +11:00
parent a89b3f97bb d5bfccdf38
commit a1f45e668e
13 changed files with 466 additions and 124 deletions
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -23,6 +23,7 @@ struct vm_fault;
 */
 #define IOMAP_F_MERGED	0x01	/* contains multiple blocks/extents */
 #define IOMAP_F_SHARED	0x02	/* block shared with another file */
+#define IOMAP_F_NEW	0x04	/* blocks have been newly allocated */

 /*
 * Magic value for blkno: