diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-07-04 01:54:58 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-07-04 01:54:58 +0200 |
| commit | 9d92573fff3ec70785ef1815cc80573f70e7a921 (patch) | |
| tree | bce6e6bbad56f805d1adcebddabf9dd9e8072ce4 /drivers/s390 | |
| parent | libnvdimm, namespace: record 'lbasize' for pmem namespaces (diff) | |
| parent | libnvdimm, pmem: disable dax flushing when pmem is fronting a volatile region (diff) | |
| download | linux-9d92573fff3ec70785ef1815cc80573f70e7a921.tar.xz linux-9d92573fff3ec70785ef1815cc80573f70e7a921.zip | |
Merge branch 'for-4.13/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/block/dcssblk.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index 36e5280af3e4..88fa7b3f7a9d 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c @@ -18,6 +18,7 @@ #include <linux/interrupt.h> #include <linux/platform_device.h> #include <linux/pfn_t.h> +#include <linux/uio.h> #include <linux/dax.h> #include <asm/extmem.h> #include <asm/io.h> @@ -43,8 +44,15 @@ static const struct block_device_operations dcssblk_devops = { .release = dcssblk_release, }; +static size_t dcssblk_dax_copy_from_iter(struct dax_device *dax_dev, + pgoff_t pgoff, void *addr, size_t bytes, struct iov_iter *i) +{ + return copy_from_iter(addr, bytes, i); +} + static const struct dax_operations dcssblk_dax_ops = { .direct_access = dcssblk_dax_direct_access, + .copy_from_iter = dcssblk_dax_copy_from_iter, }; struct dcssblk_dev_info { |