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/iomap/fiemap.c | |
| parent | a6d4040846bff49c7e870cee5693245f87f2cfce (diff) | |
| parent | 378f32bab3714f04c4e0c3aee4129f6703805550 (diff) | |
| download | linux-8d0d47ea1640b23678306c007ccc813b5b930af4.tar.xz | |
Merge branch 'mb/dio' into master
Diffstat (limited to 'fs/iomap/fiemap.c')
| -rw-r--r-- | fs/iomap/fiemap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/iomap/fiemap.c b/fs/iomap/fiemap.c index f26fdd36e383..690ef2d7c6c8 100644 --- a/fs/iomap/fiemap.c +++ b/fs/iomap/fiemap.c @@ -44,7 +44,7 @@ static int iomap_to_fiemap(struct fiemap_extent_info *fi, static loff_t iomap_fiemap_actor(struct inode *inode, loff_t pos, loff_t length, void *data, - struct iomap *iomap) + struct iomap *iomap, struct iomap *srcmap) { struct fiemap_ctx *ctx = data; loff_t ret = length; @@ -111,7 +111,7 @@ EXPORT_SYMBOL_GPL(iomap_fiemap); static loff_t iomap_bmap_actor(struct inode *inode, loff_t pos, loff_t length, - void *data, struct iomap *iomap) + void *data, struct iomap *iomap, struct iomap *srcmap) { sector_t *bno = data, addr; |