[11/11] iomap: move internal declarations into fs/iomap/

Commit Message

Darrick J. Wong July 1, 2019, 5:03 p.m. UTC

From: Darrick J. Wong <[e-mail]>

Move internal function declarations out of fs/internal.h into
fs/iomap/iomap_internal.h so that our transition is complete.

Signed-off-by: Darrick J. Wong <[e-mail]>
---
 fs/dax.c                  |    2 +-
 fs/internal.h             |   10 ----------
 fs/iomap/fiemap.c         |    2 +-
 fs/iomap/iomap.c          |    1 -
 fs/iomap/iomap_internal.h |   10 ++++++++++
 fs/iomap/migrate.c        |    1 -
 fs/iomap/page.c           |    2 +-
 fs/iomap/read.c           |    1 -
 fs/iomap/seek.c           |    2 +-
 fs/iomap/swapfile.c       |    2 +-
 10 files changed, 15 insertions(+), 18 deletions(-)

Patch

diff --git a/fs/dax.c b/fs/dax.c
index 2e48c7ebb973..86f4138c5695 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -26,7 +26,7 @@ 
 #include <linux/mmu_notifier.h>
 #include <linux/iomap.h>
 #include <asm/pgalloc.h>
-#include "internal.h"
+#include "iomap/iomap_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/fiemap.c b/fs/iomap/fiemap.c
index 42ed9ef56699..4616e7fdbf0e 100644
--- a/fs/iomap/fiemap.c
+++ b/fs/iomap/fiemap.c
@@ -8,7 +8,7 @@ 
 #include <linux/fs.h>
 #include <linux/iomap.h>
 
-#include "internal.h"
+#include "iomap_internal.h"
 
 struct fiemap_ctx {
 	struct fiemap_extent_info *fi;
diff --git a/fs/iomap/iomap.c b/fs/iomap/iomap.c
index bdaa6d07b354..8d31daf7e696 100644
--- a/fs/iomap/iomap.c
+++ b/fs/iomap/iomap.c
@@ -9,7 +9,6 @@ 
 #include <linux/iomap.h>
 #include <linux/blkdev.h>
 
-#include "internal.h"
 #include "iomap_internal.h"
 
 /*
diff --git a/fs/iomap/iomap_internal.h b/fs/iomap/iomap_internal.h
index defaa4d4b9e6..cee558386955 100644
--- a/fs/iomap/iomap_internal.h
+++ b/fs/iomap/iomap_internal.h
@@ -6,6 +6,16 @@ 
 #ifndef _IOMAP_INTERNAL_H_
 #define _IOMAP_INTERNAL_H_
 
+/*
+ * 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);
+
 sector_t iomap_sector(struct iomap *iomap, loff_t pos);
 void iomap_set_range_uptodate(struct page *page, unsigned off, unsigned len);
 struct iomap_page *iomap_page_create(struct inode *inode, struct page *page);
diff --git a/fs/iomap/migrate.c b/fs/iomap/migrate.c
index 5fd58a868c80..a25874700f95 100644
--- a/fs/iomap/migrate.c
+++ b/fs/iomap/migrate.c
@@ -9,7 +9,6 @@ 
 #include <linux/iomap.h>
 #include <linux/migrate.h>
 
-#include "internal.h"
 #include "iomap_internal.h"
 
 int
diff --git a/fs/iomap/page.c b/fs/iomap/page.c
index 1de513d5b1f7..0c18a88f4366 100644
--- a/fs/iomap/page.c
+++ b/fs/iomap/page.c
@@ -10,7 +10,7 @@ 
 #include <linux/memcontrol.h>
 #include <linux/blkdev.h>
 
-#include "internal.h"
+#include "iomap_internal.h"
 
 struct iomap_page *
 iomap_page_create(struct inode *inode, struct page *page)
diff --git a/fs/iomap/read.c b/fs/iomap/read.c
index 237516d0af8b..117626cd7ead 100644
--- a/fs/iomap/read.c
+++ b/fs/iomap/read.c
@@ -11,7 +11,6 @@ 
 #include <linux/pagemap.h>
 #include <linux/blkdev.h>
 
-#include "internal.h"
 #include "iomap_internal.h"
 
 /*
diff --git a/fs/iomap/seek.c b/fs/iomap/seek.c
index 0c36bef46522..4d2e6b668a9a 100644
--- a/fs/iomap/seek.c
+++ b/fs/iomap/seek.c
@@ -10,7 +10,7 @@ 
 #include <linux/pagemap.h>
 #include <linux/pagevec.h>
 
-#include "internal.h"
+#include "iomap_internal.h"
 
 /*
  * Seek for SEEK_DATA / SEEK_HOLE within @page, starting at @lastoff.
diff --git a/fs/iomap/swapfile.c b/fs/iomap/swapfile.c
index 4ca214d1e88d..543bb6e90a39 100644
--- a/fs/iomap/swapfile.c
+++ b/fs/iomap/swapfile.c
@@ -9,7 +9,7 @@ 
 #include <linux/iomap.h>
 #include <linux/swap.h>
 
-#include "internal.h"
+#include "iomap_internal.h"
 
 /* Swapfile activation */