From a765e20eeb423d0fa6a02ffab51141e53bbd93cb Mon Sep 17 00:00:00 2001 From: Alasdair G Kergon Date: Thu, 24 Apr 2008 22:02:01 +0100 Subject: [PATCH] dm: move include files Publish the dm-io, dm-log and dm-kcopyd headers in include/linux. Signed-off-by: Alasdair G Kergon --- drivers/md/Makefile | 2 +- drivers/md/dm-exception-store.c | 4 ++-- drivers/md/dm-io.c | 2 +- drivers/md/dm-kcopyd.c | 2 +- drivers/md/dm-log.c | 4 ++-- drivers/md/dm-raid1.c | 6 +++--- drivers/md/dm-snap.c | 2 +- drivers/md/dm-log.h => include/linux/dm-dirty-log.h | 0 {drivers/md => include/linux}/dm-io.h | 0 {drivers/md => include/linux}/dm-kcopyd.h | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename drivers/md/dm-log.h => include/linux/dm-dirty-log.h (100%) rename {drivers/md => include/linux}/dm-io.h (100%) rename {drivers/md => include/linux}/dm-kcopyd.h (98%) diff --git a/drivers/md/Makefile b/drivers/md/Makefile index be4b069bbc5..7be09eeea29 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 6933301733d..41f408068a7 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 #include #include #include +#include +#include #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 978c0414cf0..ed9c86cd053 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 @@ -13,6 +12,7 @@ #include #include #include +#include struct dm_io_client { mempool_t *pool; diff --git a/drivers/md/dm-kcopyd.c b/drivers/md/dm-kcopyd.c index 17345844b03..ee9583bee04 100644 --- a/drivers/md/dm-kcopyd.c +++ b/drivers/md/dm-kcopyd.c @@ -22,8 +22,8 @@ #include #include #include +#include -#include "kcopyd.h" #include "dm.h" /*----------------------------------------------------------------- diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c index e6b6a9d5fdd..67a6f31b7fc 100644 --- a/drivers/md/dm-log.c +++ b/drivers/md/dm-log.c @@ -9,9 +9,9 @@ #include #include #include +#include +#include -#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 5beeced4e52..6692e5a84bb 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 #include @@ -22,6 +19,9 @@ #include #include #include +#include +#include +#include #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 e1dcca99392..1ba8a47d61b 100644 --- a/drivers/md/dm-snap.c +++ b/drivers/md/dm-snap.c @@ -18,10 +18,10 @@ #include #include #include +#include #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 d3057846b0b..5db21631169 100644 --- a/drivers/md/dm-kcopyd.h +++ b/include/linux/dm-kcopyd.h @@ -14,7 +14,7 @@ #ifdef __KERNEL__ -#include "dm-io.h" +#include /* FIXME: make this configurable */ #define DM_KCOPYD_MAX_REGIONS 8 -- 2.11.4.GIT