diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2019-11-06 00:21:09 +0300 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-11-06 00:21:09 +0300 |
| commit | 8d0d47ea1640b23678306c007ccc813b5b930af4 (patch) | |
| tree | 79c4be5111bb6c1cbf495ea8d98e008da46cb6c2 /fs/gfs2/bmap.c | |
| parent | a6d4040846bff49c7e870cee5693245f87f2cfce (diff) | |
| parent | 378f32bab3714f04c4e0c3aee4129f6703805550 (diff) | |
| download | linux-8d0d47ea1640b23678306c007ccc813b5b930af4.tar.xz | |
Merge branch 'mb/dio' into master
Diffstat (limited to 'fs/gfs2/bmap.c')
| -rw-r--r-- | fs/gfs2/bmap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index f63df54a08c6..516103248272 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -1149,7 +1149,8 @@ static inline bool gfs2_iomap_need_write_lock(unsigned flags) } static int gfs2_iomap_begin(struct inode *inode, loff_t pos, loff_t length, - unsigned flags, struct iomap *iomap) + unsigned flags, struct iomap *iomap, + struct iomap *srcmap) { struct gfs2_inode *ip = GFS2_I(inode); struct metapath mp = { .mp_aheight = 1, }; |