From cb7181ff4b1ca1e4a9dbea8a3982142ce4ed73fd Mon Sep 17 00:00:00 2001
From: "Darrick J. Wong" <darrick.wong@oracle.com>
Date: Mon, 15 Jul 2019 08:51:00 -0700
Subject: [PATCH] iomap: move the main iteration code into a separate file

Move the main iteration code into a separate file so that we can group
related functions in a single file instead of having a single enormous
source file.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
 fs/Makefile                   |  1 -
 fs/iomap/Makefile             |  1 +
 fs/{iomap.c => iomap/apply.c} | 17 +----------------
 3 files changed, 2 insertions(+), 17 deletions(-)
 rename fs/{iomap.c => iomap/apply.c} (85%)

diff --git a/fs/Makefile b/fs/Makefile
index 8e61bdf9f330..d60089fd689b 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -52,7 +52,6 @@ obj-$(CONFIG_COREDUMP)		+= coredump.o
 obj-$(CONFIG_SYSCTL)		+= drop_caches.o
 
 obj-$(CONFIG_FHANDLE)		+= fhandle.o
-obj-$(CONFIG_FS_IOMAP)		+= iomap.o
 obj-y				+= iomap/
 
 obj-y				+= quota/
diff --git a/fs/iomap/Makefile b/fs/iomap/Makefile
index 19fd672cd486..2d165388d952 100644
--- a/fs/iomap/Makefile
+++ b/fs/iomap/Makefile
@@ -6,6 +6,7 @@
 obj-$(CONFIG_FS_IOMAP)		+= iomap.o
 
 iomap-y				+= \
+					apply.o \
 					buffered-io.o \
 					direct-io.o \
 					fiemap.o \
diff --git a/fs/iomap.c b/fs/iomap/apply.c
similarity index 85%
rename from fs/iomap.c
rename to fs/iomap/apply.c
index 88a3144351a9..9f956cf23867 100644
--- a/fs/iomap.c
+++ b/fs/iomap/apply.c
@@ -7,23 +7,8 @@
 #include <linux/compiler.h>
 #include <linux/fs.h>
 #include <linux/iomap.h>
-#include <linux/uaccess.h>
-#include <linux/gfp.h>
-#include <linux/migrate.h>
-#include <linux/mm.h>
-#include <linux/mm_inline.h>
-#include <linux/swap.h>
-#include <linux/pagemap.h>
-#include <linux/pagevec.h>
-#include <linux/file.h>
-#include <linux/uio.h>
-#include <linux/backing-dev.h>
-#include <linux/buffer_head.h>
-#include <linux/task_io_accounting_ops.h>
-#include <linux/dax.h>
-#include <linux/sched/signal.h>
 
-#include "internal.h"
+#include "../internal.h"
 
 /*
  * Execute a iomap write on a segment of the mapping that spans a
-- 
2.11.0