Merge branch 'for-4.19/cougar' into for-linus

New device support for hid-cougar

1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 31fef7c34185..6fb0808e87c8 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -133,7 +133,7 @@ typedef int (*dm_busy_fn) (struct dm_target *ti);
  */
 typedef long (*dm_dax_direct_access_fn) (struct dm_target *ti, pgoff_t pgoff,
                 long nr_pages, void **kaddr, pfn_t *pfn);
-typedef size_t (*dm_dax_copy_from_iter_fn)(struct dm_target *ti, pgoff_t pgoff,
+typedef size_t (*dm_dax_copy_iter_fn)(struct dm_target *ti, pgoff_t pgoff,
                 void *addr, size_t bytes, struct iov_iter *i);
 #define PAGE_SECTORS (PAGE_SIZE / 512)
 
@@ -184,7 +184,8 @@ struct target_type {
         dm_iterate_devices_fn iterate_devices;
         dm_io_hints_fn io_hints;
         dm_dax_direct_access_fn direct_access;
-        dm_dax_copy_from_iter_fn dax_copy_from_iter;
+        dm_dax_copy_iter_fn dax_copy_from_iter;
+        dm_dax_copy_iter_fn dax_copy_to_iter;
 
         /* For internal device-mapper use. */
         struct list_head list;