diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2019-07-15 08:51:01 -0700 |
|---|---|---|
| committer | Darrick J. Wong <darrick.wong@oracle.com> | 2019-07-17 07:21:02 -0700 |
| commit | 5d907307adc14cd5148b07629c2b4535acd06062 (patch) | |
| tree | f661053298a15fbbac6e609cbbb01696f4ced1d2 | |
| parent | cb7181ff4b1ca1e4a9dbea8a3982142ce4ed73fd (diff) | |
iomap: move internal declarations into fs/iomap/
Move internal function declarations out of fs/internal.h into
include/linux/iomap.h so that our transition is complete.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | fs/dax.c | 1 | ||||
| -rw-r--r-- | fs/internal.h | 10 | ||||
| -rw-r--r-- | fs/iomap/apply.c | 2 | ||||
| -rw-r--r-- | fs/iomap/fiemap.c | 2 | ||||
| -rw-r--r-- | fs/iomap/seek.c | 2 | ||||
| -rw-r--r-- | fs/iomap/swapfile.c | 2 | ||||
| -rw-r--r-- | include/linux/iomap.h | 10 |
7 files changed, 10 insertions, 19 deletions
@@ -26,7 +26,6 @@ #include <linux/mmu_notifier.h> #include <linux/iomap.h> #include <asm/pgalloc.h> -#include "internal.h" #define CREATE_TRACE_POINTS #include <trace/events/fs_dax.h> diff --git a/fs/internal.h b/fs/internal.h index 2f3c3de51fad..2b0bebd67904 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -182,15 +182,5 @@ extern const struct dentry_operations ns_dentry_operations; extern int do_vfs_ioctl(struct file *file, unsigned int fd, 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, const struct iomap_ops *ops, void *data, - iomap_actor_t actor); - /* direct-io.c: */ int sb_init_dio_done_wq(struct super_block *sb); diff --git a/fs/iomap/apply.c b/fs/iomap/apply.c index 9f956cf23867..54c02aecf3cd 100644 --- a/fs/iomap/apply.c +++ b/fs/iomap/apply.c @@ -8,8 +8,6 @@ #include <linux/fs.h> #include <linux/iomap.h> -#include "../internal.h" - /* * Execute a iomap write on a segment of the mapping that spans a * contiguous range of pages that have identical block mapping state. diff --git a/fs/iomap/fiemap.c b/fs/iomap/fiemap.c index 1fc88ec1584d..f26fdd36e383 100644 --- a/fs/iomap/fiemap.c +++ b/fs/iomap/fiemap.c @@ -7,8 +7,6 @@ #include <linux/fs.h> #include <linux/iomap.h> -#include "../internal.h" - struct fiemap_ctx { struct fiemap_extent_info *fi; struct iomap prev; diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c index 715442eb71aa..c04bad4b2b43 100644 --- a/fs/iomap/seek.c +++ b/fs/iomap/seek.c @@ -10,8 +10,6 @@ #include <linux/pagemap.h> #include <linux/pagevec.h> -#include "../internal.h" - /* * Seek for SEEK_DATA / SEEK_HOLE within @page, starting at @lastoff. * Returns true if found and updates @lastoff to the offset in file. diff --git a/fs/iomap/swapfile.c b/fs/iomap/swapfile.c index b79c33631263..152a230f668d 100644 --- a/fs/iomap/swapfile.c +++ b/fs/iomap/swapfile.c @@ -9,8 +9,6 @@ #include <linux/iomap.h> #include <linux/swap.h> -#include "../internal.h" - /* Swapfile activation */ struct iomap_swapfile_info { diff --git a/include/linux/iomap.h b/include/linux/iomap.h index baa1e2d31f05..bc499ceae392 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -123,6 +123,16 @@ struct iomap_ops { }; /* + * Main iomap iterator function. + */ +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, const struct iomap_ops *ops, void *data, + iomap_actor_t actor); + +/* * Structure allocate for each page when block size < PAGE_SIZE to track * sub-page uptodate status and I/O completions. */ |