iomap: Switch from blkno to disk offset

Replace iomap->blkno, the sector number, with iomap->addr, the disk
offset in bytes.  For invalid disk offsets, use the special value
IOMAP_NULL_ADDR instead of IOMAP_NULL_BLOCK.

This allows to use iomap for mappings which are not block aligned, such
as inline data on ext4.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>  # iomap, xfs
Reviewed-by: Jan Kara <jack@suse.cz>

1 files changed, 5 insertions, 5 deletions

diff --git a/include/linux/iomap.h b/include/linux/iomap.h
index f64dc6ce5161..7b8a615fa021 100644
--- a/include/linux/iomap.h
+++ b/include/linux/iomap.h
@@ -15,8 +15,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:
@@ -30,12 +30,12 @@ struct vm_fault;
 #define IOMAP_F_SHARED  0x20    /* block shared with another file */
 
 /*
- * 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 */