summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlasdair G Kergon <agk@redhat.com>2008-04-24 22:02:01 +0100
committerAlasdair G Kergon <agk@redhat.com>2008-04-25 13:26:55 +0100
commita765e20eeb423d0fa6a02ffab51141e53bbd93cb (patch)
treefc7279fa73a21518373e1ba2efad27dab89a2214
parent2d1e580afe23287871529ce54429e249809525a1 (diff)
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>
-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 be4b069bbc58..7be09eeea293 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 6933301733df..41f408068a7c 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 978c0414cf05..ed9c86cd053e 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 17345844b03e..ee9583bee04d 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 e6b6a9d5fdd2..67a6f31b7fc3 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 5beeced4e522..6692e5a84bb1 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 e1dcca99392e..1ba8a47d61b1 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 600c5fb2daad..600c5fb2daad 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 b6bf17ee2f61..b6bf17ee2f61 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 d3057846b0b0..5db216311695 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