diff options
| author | Ritesh Harjani <riteshh@linux.ibm.com> | 2020-02-28 14:56:54 +0530 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-03-14 14:43:12 -0400 |
| commit | 6386722a329824e005c3fd1b4a8cc37db367c76a (patch) | |
| tree | 3d97e7a6a93b7700e0c300074a2555a9f87754f0 /fs/ext4 | |
| parent | dce8e237100f60c28cc66effb526ba65a01d8cb3 (diff) | |
| download | linux-6386722a329824e005c3fd1b4a8cc37db367c76a.tar.bz2 | |
ext4: add IOMAP_F_MERGED for non-extent based mapping
IOMAP_F_MERGED needs to be set in case of non-extent based mapping.
This is needed in later patches for conversion of ext4_fiemap to use iomap.
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com>
Link: https://lore.kernel.org/r/a4764c91c08c16d4d4a4b36defb2a08625b0e9b3.1582880246.git.riteshh@linux.ibm.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/inode.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 27d009bf183f..db3ba140351e 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3333,6 +3333,10 @@ static void ext4_set_iomap(struct inode *inode, struct iomap *iomap, iomap->offset = (u64) map->m_lblk << blkbits; iomap->length = (u64) map->m_len << blkbits; + if ((map->m_flags & EXT4_MAP_MAPPED) && + !ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) + iomap->flags |= IOMAP_F_MERGED; + /* * Flags passed to ext4_map_blocks() for direct I/O writes can result * in m_flags having both EXT4_MAP_MAPPED and EXT4_MAP_UNWRITTEN bits |