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/seek.c | |
| parent | a6d4040846bff49c7e870cee5693245f87f2cfce (diff) | |
| parent | 378f32bab3714f04c4e0c3aee4129f6703805550 (diff) | |
| download | linux-8d0d47ea1640b23678306c007ccc813b5b930af4.tar.xz | |
Merge branch 'mb/dio' into master
Diffstat (limited to 'fs/iomap/seek.c')
| -rw-r--r-- | fs/iomap/seek.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c index c04bad4b2b43..89f61d93c0bc 100644 --- a/fs/iomap/seek.c +++ b/fs/iomap/seek.c @@ -119,7 +119,7 @@ out: static loff_t iomap_seek_hole_actor(struct inode *inode, loff_t offset, loff_t length, - void *data, struct iomap *iomap) + void *data, struct iomap *iomap, struct iomap *srcmap) { switch (iomap->type) { case IOMAP_UNWRITTEN: @@ -165,7 +165,7 @@ EXPORT_SYMBOL_GPL(iomap_seek_hole); static loff_t iomap_seek_data_actor(struct inode *inode, loff_t offset, loff_t length, - void *data, struct iomap *iomap) + void *data, struct iomap *iomap, struct iomap *srcmap) { switch (iomap->type) { case IOMAP_HOLE: |