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 /fs/iomap.c | |
| parent | a89b3f97bb7c248aea155a90f31d3dfb93b75971 (diff) | |
| parent | d5bfccdf38d094f2b15fae8b361d7bd47f2509d6 (diff) | |
| download | linux-a1f45e668e14c26b4700b1936c5a41b58cc4ac74.tar.gz linux-a1f45e668e14c26b4700b1936c5a41b58cc4ac74.tar.bz2 linux-a1f45e668e14c26b4700b1936c5a41b58cc4ac74.zip | |
Merge branch 'iomap-4.9-dax' into for-next
Diffstat (limited to 'fs/iomap.c')
| -rw-r--r-- | fs/iomap.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/iomap.c b/fs/iomap.c index ec411a6b9edc..013d1d36fbbf 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -27,9 +27,6 @@ #include <linux/dax.h> #include "internal.h" -typedef loff_t (*iomap_actor_t)(struct inode *inode, loff_t pos, loff_t len, - void *data, struct iomap *iomap); - /* * Execute a iomap write on a segment of the mapping that spans a * contiguous range of pages that have identical block mapping state. @@ -41,7 +38,7 @@ typedef loff_t (*iomap_actor_t)(struct inode *inode, loff_t pos, loff_t len, * resources they require in the iomap_begin call, and release them in the * iomap_end call. */ -static loff_t +loff_t iomap_apply(struct inode *inode, loff_t pos, loff_t length, unsigned flags, struct iomap_ops *ops, void *data, iomap_actor_t actor) { |