summaryrefslogtreecommitdiff
path: root/fs/iomap/swapfile.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2019-11-06 00:21:09 +0300
committerTheodore Ts'o <tytso@mit.edu>2019-11-06 00:21:09 +0300
commit8d0d47ea1640b23678306c007ccc813b5b930af4 (patch)
tree79c4be5111bb6c1cbf495ea8d98e008da46cb6c2 /fs/iomap/swapfile.c
parenta6d4040846bff49c7e870cee5693245f87f2cfce (diff)
parent378f32bab3714f04c4e0c3aee4129f6703805550 (diff)
downloadlinux-8d0d47ea1640b23678306c007ccc813b5b930af4.tar.xz
Merge branch 'mb/dio' into master
Diffstat (limited to 'fs/iomap/swapfile.c')
-rw-r--r--fs/iomap/swapfile.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/iomap/swapfile.c b/fs/iomap/swapfile.c
index 152a230f668d..a648dbf6991e 100644
--- a/fs/iomap/swapfile.c
+++ b/fs/iomap/swapfile.c
@@ -76,7 +76,8 @@ static int iomap_swapfile_add_extent(struct iomap_swapfile_info *isi)
* distinction between written and unwritten extents.
*/
static loff_t iomap_swapfile_activate_actor(struct inode *inode, loff_t pos,
- loff_t count, void *data, struct iomap *iomap)
+ loff_t count, void *data, struct iomap *iomap,
+ struct iomap *srcmap)
{
struct iomap_swapfile_info *isi = data;
int error;