summaryrefslogtreecommitdiffstats
path: root/fs/dax.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2017-05-29 21:56:49 -0700
committerDan Williams <dan.j.williams@intel.com>2017-06-15 14:34:59 -0700
commitfec53774fd043038e57ac737d90e8d58975d6e92 (patch)
treeb6055824398e5df4d1010f50202cb236faa1d504 /fs/dax.c
parent7e026c8c0a4200da86bc51edeaad79dcdccf78ca (diff)
downloadlinux-fec53774fd043038e57ac737d90e8d58975d6e92.tar.gz
linux-fec53774fd043038e57ac737d90e8d58975d6e92.tar.bz2
linux-fec53774fd043038e57ac737d90e8d58975d6e92.zip
filesystem-dax: convert to dax_copy_from_iter()
Now that all possible providers of the dax_operations copy_from_iter method are implemented, switch filesytem-dax to call the driver rather than copy_to_iter_pmem. Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'fs/dax.c')
-rw-r--r--fs/dax.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/dax.c b/fs/dax.c
index 2a6889b3585f..b459948de427 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -1054,7 +1054,8 @@ dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data,
map_len = end - pos;
if (iov_iter_rw(iter) == WRITE)
- map_len = copy_from_iter_pmem(kaddr, map_len, iter);
+ map_len = dax_copy_from_iter(dax_dev, pgoff, kaddr,
+ map_len, iter);
else
map_len = copy_to_iter(kaddr, map_len, iter);
if (map_len <= 0) {