diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-08-29 11:33:58 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-08-29 11:33:58 +1000 |
| commit | 17de0a9ff3df8f54f2f47746d118112d4e61d973 (patch) | |
| tree | b097752623a7a6a8e1be1540a52a6eb376da76eb /include | |
| parent | 800b2694f890cc35a1bda63501fc71c94389d517 (diff) | |
| download | linux-17de0a9ff3df8f54f2f47746d118112d4e61d973.tar.gz linux-17de0a9ff3df8f54f2f47746d118112d4e61d973.tar.bz2 linux-17de0a9ff3df8f54f2f47746d118112d4e61d973.zip | |
iomap: don't set FIEMAP_EXTENT_MERGED for extent based filesystems
Filesystems like XFS that use extents should not set the
FIEMAP_EXTENT_MERGED flag in the fiemap extent structures. To allow
for both behaviors for the upcoming gfs2 usage split the iomap
type field into type and flags, and only set FIEMAP_EXTENT_MERGED if
the IOMAP_F_MERGED flag is set. The flags field will also come in
handy for future features such as shared extents on reflink-enabled
file systems.
Reported-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/iomap.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 3267df461012..3d70ece10313 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -19,6 +19,11 @@ struct vm_fault; #define IOMAP_UNWRITTEN 0x04 /* blocks allocated @blkno in unwritten state */ /* + * Flags for iomap mappings: + */ +#define IOMAP_F_MERGED 0x01 /* contains multiple blocks/extents */ + +/* * Magic value for blkno: */ #define IOMAP_NULL_BLOCK -1LL /* blkno is not valid */ @@ -27,7 +32,8 @@ struct iomap { sector_t blkno; /* 1st sector of mapping, 512b units */ loff_t offset; /* file offset of mapping, bytes */ u64 length; /* length of mapping, bytes */ - int type; /* type of mapping */ + u16 type; /* type of mapping */ + u16 flags; /* flags for mapping */ struct block_device *bdev; /* block device for I/O */ }; |