diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-10-03 09:53:59 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-10-03 09:53:59 +1100 |
| commit | a1f45e668e14c26b4700b1936c5a41b58cc4ac74 (patch) | |
| tree | 94c1d2b34c15fff8ff39baf7357673978b5a3b2f /include/linux | |
| parent | a89b3f97bb7c248aea155a90f31d3dfb93b75971 (diff) | |
| parent | d5bfccdf38d094f2b15fae8b361d7bd47f2509d6 (diff) | |
Merge branch 'iomap-4.9-dax' into for-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dax.h | 6 | ||||
| -rw-r--r-- | include/linux/iomap.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/dax.h b/include/linux/dax.h index 9c6dc7704043..add6c4bc568f 100644 --- a/include/linux/dax.h +++ b/include/linux/dax.h @@ -6,13 +6,19 @@ #include <linux/radix-tree.h> #include <asm/pgtable.h> +struct iomap_ops; + /* We use lowest available exceptional entry bit for locking */ #define RADIX_DAX_ENTRY_LOCK (1 << RADIX_TREE_EXCEPTIONAL_SHIFT) +ssize_t iomap_dax_rw(struct kiocb *iocb, struct iov_iter *iter, + struct iomap_ops *ops); ssize_t dax_do_io(struct kiocb *, struct inode *, struct iov_iter *, get_block_t, dio_iodone_t, int flags); int dax_zero_page_range(struct inode *, loff_t from, unsigned len, get_block_t); int dax_truncate_page(struct inode *, loff_t from, get_block_t); +int iomap_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf, + struct iomap_ops *ops); int dax_fault(struct vm_area_struct *, struct vm_fault *, get_block_t); int dax_delete_mapping_entry(struct address_space *mapping, pgoff_t index); void dax_wake_mapping_entry_waiter(struct address_space *mapping, diff --git a/include/linux/iomap.h b/include/linux/iomap.h index c74226a738a3..e63e288dee83 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -23,6 +23,7 @@ struct vm_fault; */ #define IOMAP_F_MERGED 0x01 /* contains multiple blocks/extents */ #define IOMAP_F_SHARED 0x02 /* block shared with another file */ +#define IOMAP_F_NEW 0x04 /* blocks have been newly allocated */ /* * Magic value for blkno: |