[RFCv2,1/4] ext4: Add IOMAP_F_MERGED for non-extent based mapping
diff mbox series

Message ID fcdbc7e97b8d88eb60151c131451947c498f76f6.1580121790.git.riteshh@linux.ibm.com
State New
Headers show
Series
  • ext4: bmap & fiemap conversion to use iomap
Related show

Commit Message

Ritesh Harjani Jan. 28, 2020, 10:18 a.m. UTC
IOMAP_F_MERGED needs to be set in case of non-extent based mapping. This
is also needed for conversion of fiemap to use iomap.

Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com>
---
 fs/ext4/inode.c | 4 ++++
 1 file changed, 4 insertions(+)

Patch
diff mbox series

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index d035acab5b2a..3b4230cf0bc2 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3335,6 +3335,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_UNWRITTEN | 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