dm: move include files

Publish the dm-io, dm-log and dm-kcopyd headers in include/linux.

Signed-off-by: Alasdair G Kergon <agk@redhat.com>

diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index be4b069bbc58be5203881468610d1f3f6a3c2a56..7be09eeea293c307c6213bc689840f5c1ac90c4d 100644 (file)
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -3,7 +3,7 @@
 #
 
 dm-mod-objs    := dm.o dm-table.o dm-target.o dm-linear.o dm-stripe.o \
-                  dm-ioctl.o dm-io.o kcopyd.o
+                  dm-ioctl.o dm-io.o dm-kcopyd.o
 dm-multipath-objs := dm-hw-handler.o dm-path-selector.o dm-mpath.o
 dm-snapshot-objs := dm-snap.o dm-exception-store.o
 dm-mirror-objs := dm-raid1.o

diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c
index 6933301733df1c6d2969c120bb2e17a996cf6216..41f408068a7c9c2329c61eb7e3eb47a82af6e280 100644 (file)
--- a/drivers/md/dm-exception-store.c
+++ b/drivers/md/dm-exception-store.c
@@ -9,13 +9,13 @@
 
 #include "dm.h"
 #include "dm-snap.h"
-#include "dm-io.h"
-#include "kcopyd.h"
 
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/vmalloc.h>
 #include <linux/slab.h>
+#include <linux/dm-io.h>
+#include <linux/dm-kcopyd.h>
 
 #define DM_MSG_PREFIX "snapshots"
 #define DM_CHUNK_SIZE_DEFAULT_SECTORS 32       /* 16KB */

diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index 978c0414cf05dada34959d9d58135553e5adbadf..ed9c86cd053e81f32b5c6551d3246461c00d5d30 100644 (file)
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -5,7 +5,6 @@
  * This file is released under the GPL.
  */
 
-#include "dm-io.h"
 #include "dm.h"
 
 #include <linux/bio.h>
@@ -13,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
+#include <linux/dm-io.h>
 
 struct dm_io_client {
        mempool_t *pool;

diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c
index 17345844b03eb92c5b8a86d1eabc980b8869fed7..ee9583bee04d549cad92a7a809c220d6071f89bd 100644 (file)
--- a/drivers/md/dm-kcopyd.c
+++ b/drivers/md/dm-kcopyd.c
@@ -22,8 +22,8 @@
 #include <linux/vmalloc.h>
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
+#include <linux/dm-kcopyd.h>
 
-#include "kcopyd.h"
 #include "dm.h"
 
 /*-----------------------------------------------------------------

diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index e6b6a9d5fdd2651aeca88262a211e7aed67e3bea..67a6f31b7fc3e2d39a3dfbf6813d6b163eae6707 100644 (file)
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
@@ -9,9 +9,9 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/vmalloc.h>
+#include <linux/dm-io.h>
+#include <linux/dm-dirty-log.h>
 
-#include "dm-log.h"
-#include "dm-io.h"
 #include "dm.h"
 
 #define DM_MSG_PREFIX "dirty region log"

diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 5beeced4e52263f664ae1de9c53f2a9cd5faa0ac..6692e5a84bb1b05441214a3f27424d3a59fbd2a7 100644 (file)
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -7,9 +7,6 @@
 #include "dm.h"
 #include "dm-bio-list.h"
 #include "dm-bio-record.h"
-#include "dm-io.h"
-#include "dm-log.h"
-#include "kcopyd.h"
 
 #include <linux/ctype.h>
 #include <linux/init.h>
@@ -22,6 +19,9 @@
 #include <linux/workqueue.h>
 #include <linux/log2.h>
 #include <linux/hardirq.h>
+#include <linux/dm-io.h>
+#include <linux/dm-dirty-log.h>
+#include <linux/dm-kcopyd.h>
 
 #define DM_MSG_PREFIX "raid1"
 #define DM_IO_PAGES 64

diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index e1dcca99392ef0227dcc54698e9ea4093617a14d..1ba8a47d61b116646c6ac8ef533cd5b8f64767a7 100644 (file)
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -18,10 +18,10 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/log2.h>
+#include <linux/dm-kcopyd.h>
 
 #include "dm-snap.h"
 #include "dm-bio-list.h"
-#include "kcopyd.h"
 
 #define DM_MSG_PREFIX "snapshots"
 

diff --git a/drivers/md/dm-log.h b/include/linux/dm-dirty-log.h
similarity index 100%
rename from drivers/md/dm-log.h
rename to include/linux/dm-dirty-log.h

diff --git a/drivers/md/dm-io.h b/include/linux/dm-io.h
similarity index 100%
rename from drivers/md/dm-io.h
rename to include/linux/dm-io.h

diff --git a/drivers/md/dm-kcopyd.h b/include/linux/dm-kcopyd.h
similarity index 98%
rename from drivers/md/dm-kcopyd.h
rename to include/linux/dm-kcopyd.h
index d3057846b0b089d3a614f22f5c2caae62656f320..5db21631169567af72279f3d2fc65bec48c511ea 100644 (file)
--- a/drivers/md/dm-kcopyd.h
+++ b/include/linux/dm-kcopyd.h
@@ -14,7 +14,7 @@
 
 #ifdef __KERNEL__
 
-#include "dm-io.h"
+#include <linux/dm-io.h>
 
 /* FIXME: make this configurable */
 #define DM_KCOPYD_MAX_REGIONS 8