summaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2019-11-05 11:31:32 -0500
committerTheodore Ts'o <tytso@mit.edu>2019-11-05 11:31:32 -0500
commitf21bdbba0a5ac69e0a632ad974f5c0df9b7d411c (patch)
tree51b845f801d410058962da671d6f2556eee6aaad /fs/ext4
parent0d0a60c92fedbd4bf484c4c9b5cd49c16d05fb3f (diff)
parenta901004214994f12523b47521cddfa4426f284c1 (diff)
downloadlinux-f21bdbba0a5ac69e0a632ad974f5c0df9b7d411c.tar.gz
linux-f21bdbba0a5ac69e0a632ad974f5c0df9b7d411c.tar.bz2
linux-f21bdbba0a5ac69e0a632ad974f5c0df9b7d411c.zip
Merge branch 'iomap-for-next' into mb/dio
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index da9fed86086c..0d8971b819e9 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3449,7 +3449,7 @@ static bool ext4_inode_datasync_dirty(struct inode *inode)
}
static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
- unsigned flags, struct iomap *iomap)
+ unsigned flags, struct iomap *iomap, struct iomap *srcmap)
{
struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
unsigned int blkbits = inode->i_blkbits;