summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/md/Makefile2
-rw-r--r--drivers/md/dm-exception-store.c4
-rw-r--r--drivers/md/dm-io.c2
-rw-r--r--drivers/md/dm-kcopyd.c2
-rw-r--r--drivers/md/dm-log.c4
-rw-r--r--drivers/md/dm-raid1.c6
-rw-r--r--drivers/md/dm-snap.c2
-rw-r--r--include/linux/dm-dirty-log.h (renamed from drivers/md/dm-log.h)0
-rw-r--r--include/linux/dm-io.h (renamed from drivers/md/dm-io.h)0
-rw-r--r--include/linux/dm-kcopyd.h (renamed from drivers/md/dm-kcopyd.h)2
10 files changed, 12 insertions, 12 deletions
diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index be4b069..7be09ee 100644
--- 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 6933301..41f4080 100644
--- 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 978c041..ed9c86c 100644
--- 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 1734584..ee9583b 100644
--- 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 e6b6a9d..67a6f31 100644
--- 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 5beeced..6692e5a 100644
--- 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 e1dcca9..1ba8a47 100644
--- 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
index 600c5fb..600c5fb 100644
--- a/drivers/md/dm-log.h
+++ b/include/linux/dm-dirty-log.h
diff --git a/drivers/md/dm-io.h b/include/linux/dm-io.h
index b6bf17e..b6bf17e 100644
--- a/drivers/md/dm-io.h
+++ b/include/linux/dm-io.h
diff --git a/drivers/md/dm-kcopyd.h b/include/linux/dm-kcopyd.h
index d305784..5db2163 100644
--- 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
OpenPOWER on IntegriCloud