| Message ID | 1473438884-674-3-git-send-email-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 09, 2016 at 06:34:36PM +0200, Christoph Hellwig wrote: > This allows the DAX code to use it. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> > --- > fs/internal.h | 11 +++++++++++ > fs/iomap.c | 5 +---- > 2 files changed, 12 insertions(+), 4 deletions(-) > > diff --git a/fs/internal.h b/fs/internal.h > index ba07376..8591786 100644 > --- a/fs/internal.h > +++ b/fs/internal.h > @@ -12,6 +12,7 @@ > struct super_block; > struct file_system_type; > struct iomap; > +struct iomap_ops; > struct linux_binprm; > struct path; > struct mount; > @@ -164,3 +165,13 @@ extern struct dentry_operations ns_dentry_operations; > extern int do_vfs_ioctl(struct file *file, unsigned int fd, unsigned int cmd, > unsigned long arg); > extern long vfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); > + > +/* > + * iomap support: > + */ > +typedef loff_t (*iomap_actor_t)(struct inode *inode, loff_t pos, loff_t len, > + void *data, struct iomap *iomap); > + > +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); > diff --git a/fs/iomap.c b/fs/iomap.c > index 706270f..f4df9c6 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) > { > -- > 2.1.4 > > _______________________________________________ > Linux-nvdimm mailing list > Linux-nvdimm@lists.01.org > https://lists.01.org/mailman/listinfo/linux-nvdimm -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/internal.h b/fs/internal.h index ba07376..8591786 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -12,6 +12,7 @@ struct super_block; struct file_system_type; struct iomap; +struct iomap_ops; struct linux_binprm; struct path; struct mount; @@ -164,3 +165,13 @@ extern struct dentry_operations ns_dentry_operations; extern int do_vfs_ioctl(struct file *file, unsigned int fd, unsigned int cmd, unsigned long arg); extern long vfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); + +/* + * iomap support: + */ +typedef loff_t (*iomap_actor_t)(struct inode *inode, loff_t pos, loff_t len, + void *data, struct iomap *iomap); + +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); diff --git a/fs/iomap.c b/fs/iomap.c index 706270f..f4df9c6 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) {
This allows the DAX code to use it. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/internal.h | 11 +++++++++++ fs/iomap.c | 5 +---- 2 files changed, 12 insertions(+), 4 deletions(-)