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 /fs/iomap.c | |
| 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 'fs/iomap.c')
| -rw-r--r-- | fs/iomap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/iomap.c b/fs/iomap.c index 0342254646e3..706270f21b35 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -428,9 +428,12 @@ static int iomap_to_fiemap(struct fiemap_extent_info *fi, break; } + if (iomap->flags & IOMAP_F_MERGED) + flags |= FIEMAP_EXTENT_MERGED; + return fiemap_fill_next_extent(fi, iomap->offset, iomap->blkno != IOMAP_NULL_BLOCK ? iomap->blkno << 9: 0, - iomap->length, flags | FIEMAP_EXTENT_MERGED); + iomap->length, flags); } |