summaryrefslogtreecommitdiffstats
path: root/fs/dax.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2021-08-11 21:04:43 +0200
committerDan Williams <dan.j.williams@intel.com>2021-08-11 21:04:43 +0200
commit96dcb97d0a40a60b9aee9f2c7a44ce8a1b6704bc (patch)
tree62a1534997a3b4048c8d4a9f036578a50fff9e49 /fs/dax.c
parenttools/testing/nvdimm: Fix missing 'fallthrough' warning (diff)
parentdax: Ensure errno is returned from dax_direct_access (diff)
downloadlinux-96dcb97d0a40a60b9aee9f2c7a44ce8a1b6704bc.tar.xz
linux-96dcb97d0a40a60b9aee9f2c7a44ce8a1b6704bc.zip
Merge branch 'for-5.14/dax' into libnvdimm-fixes
Pick up some small dax cleanups that make some of Ira's follow on work easier.
Diffstat (limited to 'fs/dax.c')
-rw-r--r--fs/dax.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dax.c b/fs/dax.c
index da41f9363568..99b4e78d888f 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -722,7 +722,7 @@ static int copy_cow_page_dax(struct block_device *bdev, struct dax_device *dax_d
return rc;
id = dax_read_lock();
- rc = dax_direct_access(dax_dev, pgoff, PHYS_PFN(PAGE_SIZE), &kaddr, NULL);
+ rc = dax_direct_access(dax_dev, pgoff, 1, &kaddr, NULL);
if (rc < 0) {
dax_read_unlock(id);
return rc;