Let callers pass in additional flags for ext4_map_blocks(). This is in preparation of the upcoming changes. Signed-off-by: Ojaswin Mujoo --- fs/ext4/ext4.h | 3 ++- fs/ext4/extents.c | 8 ++++---- fs/ext4/file.c | 2 +- fs/ext4/page-io.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 8d3af062a830..b72f90b6375b 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -3971,7 +3971,8 @@ extern long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len); extern int ext4_convert_unwritten_extents(handle_t *handle, struct inode *inode, loff_t offset, ssize_t len, - ext4_lblk_t *converted); + ext4_lblk_t *converted, + int extra_flags); extern int ext4_convert_unwritten_extents_atomic(handle_t *handle, struct inode *inode, loff_t offset, ssize_t len); extern int ext4_convert_unwritten_io_end_vec(handle_t *handle, diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 7193429a05e1..a229983f91dd 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4704,7 +4704,7 @@ static int ext4_alloc_file_blocks(struct file *file, loff_t offset, loff_t len, ret = ext4_convert_unwritten_extents(handle, inode, (loff_t)map.m_lblk << blkbits, (loff_t)map.m_len << blkbits, - &converted); + &converted, 0); if (ret) map.m_len = converted; @@ -5152,7 +5152,7 @@ int ext4_convert_unwritten_extents_atomic(handle_t *handle, struct inode *inode, */ int ext4_convert_unwritten_extents(handle_t *handle, struct inode *inode, loff_t offset, ssize_t len, - ext4_lblk_t *converted) + ext4_lblk_t *converted, int extra_flags) { ext4_lblk_t max_blocks, conv_blocks = 0; int ret = 0, ret2 = 0, ret3 = 0; @@ -5195,7 +5195,7 @@ int ext4_convert_unwritten_extents(handle_t *handle, struct inode *inode, */ ret = ext4_map_blocks(handle, inode, &map, EXT4_GET_BLOCKS_IO_CONVERT_EXT | - EXT4_EX_NOCACHE); + EXT4_EX_NOCACHE | extra_flags); if (ret <= 0) { ext4_warning(inode->i_sb, "inode #%llu: block %u: len %u: ext4_map_blocks returned %d", @@ -5248,7 +5248,7 @@ int ext4_convert_unwritten_io_end_vec(handle_t *handle, ext4_io_end_t *io_end) list_for_each_entry(io_end_vec, &io_end->list_vec, list) { ret = ext4_convert_unwritten_extents(handle, io_end->inode, io_end_vec->offset, - io_end_vec->size, NULL); + io_end_vec->size, NULL, 0); if (ret) break; } diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 50d3c92709c8..06ef7a9b9f83 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -457,7 +457,7 @@ static int ext4_dio_write_end_io(struct kiocb *iocb, ssize_t size, size); else if (!error && size && flags & IOMAP_DIO_UNWRITTEN) error = ext4_convert_unwritten_extents(NULL, inode, pos, size, - NULL); + NULL, 0); if (error) return error; /* diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c index 734d856a6d47..4c5c77da2a5e 100644 --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c @@ -685,7 +685,7 @@ static void ext4_iomap_finish_ioend(struct iomap_ioend *ioend) if (ioend->io_flags & IOMAP_IOEND_UNWRITTEN) ret = ext4_convert_unwritten_extents(handle, inode, pos, - size, NULL); + size, NULL, 0); out_journal: err = ext4_journal_stop(handle); -- 2.55.0