Merge tag 'iio-for-4.13a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[karo-tx-linux.git] / drivers / md / dm-snap.c

diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index c65feeada864e59608d617b939e877f36e271c3c..e152d9817c81a078a1aec8e9243b7b3dc74be5d8 100644 (file)
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -2302,8 +2302,8 @@ static int origin_map(struct dm_target *ti, struct bio *bio)
        return do_origin(o->dev, bio);
 }
 
-static long origin_direct_access(struct dm_target *ti, sector_t sector,
-               void **kaddr, pfn_t *pfn, long size)
+static long origin_dax_direct_access(struct dm_target *ti, pgoff_t pgoff,
+               long nr_pages, void **kaddr, pfn_t *pfn)
 {
        DMWARN("device does not support dax.");
        return -EIO;
@@ -2368,7 +2368,7 @@ static struct target_type origin_target = {
        .postsuspend = origin_postsuspend,
        .status  = origin_status,
        .iterate_devices = origin_iterate_devices,
-       .direct_access = origin_direct_access,
+       .direct_access = origin_dax_direct_access,
 };
 
 static struct target_type snapshot_target = {