Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Pull ext4 updates from Ted Ts'o:

 - Add support for online resizing of file systems with bigalloc

 - Fix a two data corruption bugs involving DAX, as well as a corruption
   bug after a crash during a racing fallocate and delayed allocation.

 - Finally, a number of cleanups and optimizations.

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: improve smp scalability for inode generation
  ext4: add support for online resizing with bigalloc
  ext4: mention noload when recovering on read-only device
  Documentation: fix little inconsistencies
  ext4: convert timers to use timer_setup()
  jbd2: convert timers to use timer_setup()
  ext4: remove duplicate extended attributes defs
  ext4: add ext4_should_use_dax()
  ext4: add sanity check for encryption + DAX
  ext4: prevent data corruption with journaling + DAX
  ext4: prevent data corruption with inline data + DAX
  ext4: fix interaction between i_size, fallocate, and delalloc after a crash
  ext4: retry allocations conservatively
  ext4: Switch to iomap for SEEK_HOLE / SEEK_DATA
  ext4: Add iomap support for inline data
  iomap: Add IOMAP_F_DATA_INLINE flag
  iomap: Switch from blkno to disk offset

1 files changed, 8 insertions, 7 deletions

diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index 8a7c6d26b147..76ce247d3d4b 100644
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -16,8 +16,8 @@ struct vm_fault;
  */
 #define IOMAP_HOLE      0x01    /* no blocks allocated, need allocation */
 #define IOMAP_DELALLOC  0x02    /* delayed allocation blocks */
-#define IOMAP_MAPPED    0x03    /* blocks allocated @blkno */
-#define IOMAP_UNWRITTEN 0x04    /* blocks allocated @blkno in unwritten state */
+#define IOMAP_MAPPED    0x03    /* blocks allocated at @addr */
+#define IOMAP_UNWRITTEN 0x04    /* blocks allocated at @addr in unwritten state */
 
 /*
  * Flags for all iomap mappings:
@@ -27,16 +27,17 @@ struct vm_fault;
 /*
  * Flags that only need to be reported for IOMAP_REPORT requests:
  */
-#define IOMAP_F_MERGED  0x10    /* contains multiple blocks/extents */
-#define IOMAP_F_SHARED  0x20    /* block shared with another file */
+#define IOMAP_F_MERGED          0x10    /* contains multiple blocks/extents */
+#define IOMAP_F_SHARED          0x20    /* block shared with another file */
+#define IOMAP_F_DATA_INLINE     0x40    /* data inline in the inode */
 
 /*
- * Magic value for blkno:
+ * Magic value for addr:
  */
-#define IOMAP_NULL_BLOCK -1LL   /* blkno is not valid */
+#define IOMAP_NULL_ADDR -1ULL   /* addr is not valid */
 
 struct iomap {
-        sector_t                blkno;  /* 1st sector of mapping, 512b units */
+        u64                     addr; /* disk offset of mapping, bytes */
         loff_t                  offset; /* file offset of mapping, bytes */
         u64                     length; /* length of mapping, bytes */
         u16                     type;   /* type of mapping */