diff options
| author |   Dan Williams <dan.j.williams@intel.com> | 2021-08-11 12:04:43 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2021-08-11 12:04:43 -0700 |
| commit | 96dcb97d0a40a60b9aee9f2c7a44ce8a1b6704bc (patch) | |
| tree | 62a1534997a3b4048c8d4a9f036578a50fff9e49 /fs | |
| parent | tools/testing/nvdimm: Fix missing 'fallthrough' warning (diff) | |
| parent | dax: Ensure errno is returned from dax_direct_access (diff) | |
| download | linux-dev-96dcb97d0a40a60b9aee9f2c7a44ce8a1b6704bc.tar.xz linux-dev-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')
| -rw-r--r-- | fs/dax.c | 2 | ||||
| -rw-r--r-- | fs/fuse/dax.c | 6 |
2 files changed, 3 insertions, 5 deletions
@@ -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; diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c index e55723744f58..9d58371d22c2 100644 --- a/fs/fuse/dax.c +++ b/fs/fuse/dax.c @@ -1235,8 +1235,6 @@ void fuse_dax_conn_free(struct fuse_conn *fc) static int fuse_dax_mem_range_init(struct fuse_conn_dax *fcd) { long nr_pages, nr_ranges; - void *kaddr; - pfn_t pfn; struct fuse_dax_mapping *range; int ret, id; size_t dax_size = -1; @@ -1248,8 +1246,8 @@ static int fuse_dax_mem_range_init(struct fuse_conn_dax *fcd) INIT_DELAYED_WORK(&fcd->free_work, fuse_dax_free_mem_worker); id = dax_read_lock(); - nr_pages = dax_direct_access(fcd->dev, 0, PHYS_PFN(dax_size), &kaddr, - &pfn); + nr_pages = dax_direct_access(fcd->dev, 0, PHYS_PFN(dax_size), NULL, + NULL); dax_read_unlock(id); if (nr_pages < 0) { pr_debug("dax_direct_access() returned %ld\n", nr_pages); |