---
 drivers/md/Makefile   |    3 +++
 drivers/md/dm-table.c |    7 -------
 drivers/md/dm-thin.c  |    2 +-
 drivers/md/dm.c       |    1 +
 4 files changed, 5 insertions(+), 8 deletions(-)

Index: linux-3.0-fast/drivers/md/dm-thin.c
===================================================================
--- linux-3.0-fast.orig/drivers/md/dm-thin.c	2011-08-09 20:57:14.000000000 +0200
+++ linux-3.0-fast/drivers/md/dm-thin.c	2011-08-09 20:57:26.000000000 +0200
@@ -1326,7 +1326,7 @@ static struct pool *pool_create(struct b
 		goto bad_prison;
 	}
 
-	pool->copier = dm_kcopyd_client_create();
+	pool->copier = dm_kcopyd_client_create(NULL);
 	if (IS_ERR(pool->copier)) {
 		r = PTR_ERR(pool->copier);
 		*error = "Error creating pool's kcopyd client";
Index: linux-3.0-fast/drivers/md/Makefile
===================================================================
--- linux-3.0-fast.orig/drivers/md/Makefile	2011-08-09 20:55:16.000000000 +0200
+++ linux-3.0-fast/drivers/md/Makefile	2011-08-09 20:57:26.000000000 +0200
@@ -10,6 +10,7 @@ dm-snapshot-y	+= dm-snap.o dm-exception-
 dm-mirror-y	+= dm-raid1.o
 dm-log-userspace-y \
 		+= dm-log-userspace-base.o dm-log-userspace-transfer.o
+dm-thin-pool-y	+= dm-thin.o dm-thin-metadata.o
 md-mod-y	+= md.o bitmap.o
 raid456-y	+= raid5.o
 
@@ -37,10 +38,12 @@ obj-$(CONFIG_DM_MULTIPATH_QL)	+= dm-queu
 obj-$(CONFIG_DM_MULTIPATH_ST)	+= dm-service-time.o
 obj-$(CONFIG_DM_SNAPSHOT)	+= dm-snapshot.o
 obj-$(CONFIG_DM_MULTISNAPSHOT)	+= multisnap/
+obj-$(CONFIG_DM_PERSISTENT_DATA)	+= persistent-data/
 obj-$(CONFIG_DM_MIRROR)		+= dm-mirror.o dm-log.o dm-region-hash.o
 obj-$(CONFIG_DM_LOG_USERSPACE)	+= dm-log-userspace.o
 obj-$(CONFIG_DM_ZERO)		+= dm-zero.o
 obj-$(CONFIG_DM_RAID)	+= dm-raid.o
+obj-$(CONFIG_DM_THIN_PROVISIONING)	+= dm-thin-pool.o
 obj-$(CONFIG_DM_ZEROED)	+= dm-zeroed.o
 
 ifeq ($(CONFIG_DM_UEVENT),y)
Index: linux-3.0-fast/drivers/md/dm-table.c
===================================================================
--- linux-3.0-fast.orig/drivers/md/dm-table.c	2011-08-09 20:57:14.000000000 +0200
+++ linux-3.0-fast/drivers/md/dm-table.c	2011-08-09 20:57:26.000000000 +0200
@@ -549,13 +549,6 @@ int dm_set_device_limits(struct dm_targe
 }
 EXPORT_SYMBOL_GPL(dm_set_device_limits);
 
-int dm_get_device(struct dm_target *ti, const char *path, fmode_t mode,
-		  struct dm_dev **result)
-{
-	return __table_get_device(ti->table, ti, path, mode, result);
-}
-
-
 /*
  * Decrement a devices use count and remove it if necessary.
  */
Index: linux-3.0-fast/drivers/md/dm.c
===================================================================
--- linux-3.0-fast.orig/drivers/md/dm.c	2011-08-09 20:27:54.000000000 +0200
+++ linux-3.0-fast/drivers/md/dm.c	2011-08-09 20:57:26.000000000 +0200
@@ -2149,6 +2149,7 @@ unsigned dm_get_md_type(struct mapped_de
 {
 	return md->type;
 }
+EXPORT_SYMBOL_GPL(dm_get_md);
 
 /*
  * Fully initialize a request-based queue (->elevator, ->request_fn, etc).