diff options
author | Dan Williams <dan.j.williams@intel.com> | 2021-08-11 21:04:43 +0200 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2021-08-11 21:04:43 +0200 |
commit | 96dcb97d0a40a60b9aee9f2c7a44ce8a1b6704bc (patch) | |
tree | 62a1534997a3b4048c8d4a9f036578a50fff9e49 /drivers | |
parent | tools/testing/nvdimm: Fix missing 'fallthrough' warning (diff) | |
parent | dax: Ensure errno is returned from dax_direct_access (diff) | |
download | linux-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 'drivers')
-rw-r--r-- | drivers/dax/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dax/super.c b/drivers/dax/super.c index 5fa6ae9dbc8b..44736cbd446e 100644 --- a/drivers/dax/super.c +++ b/drivers/dax/super.c @@ -313,7 +313,7 @@ long dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, long nr_pages, return -ENXIO; if (nr_pages < 0) - return nr_pages; + return -EINVAL; avail = dax_dev->ops->direct_access(dax_dev, pgoff, nr_pages, kaddr, pfn); |