3 files changed, 11 insertions, 12 deletions

diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index d9aa7edb8780..be4b069bbc58 100644
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -6,7 +6,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-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-log.o dm-raid1.o
+dm-mirror-objs  := dm-raid1.o
 dm-rdac-objs    := dm-mpath-rdac.o
 dm-hp-sw-objs   := dm-mpath-hp-sw.o
 md-mod-objs     := md.o bitmap.o
@@ -39,7 +39,7 @@ obj-$(CONFIG_DM_MULTIPATH_EMC)	+= dm-emc.o
 obj-$(CONFIG_DM_MULTIPATH_HP)   += dm-hp-sw.o
 obj-$(CONFIG_DM_MULTIPATH_RDAC) += dm-rdac.o
 obj-$(CONFIG_DM_SNAPSHOT)       += dm-snapshot.o
-obj-$(CONFIG_DM_MIRROR)         += dm-mirror.o
+obj-$(CONFIG_DM_MIRROR)         += dm-mirror.o dm-log.o
 obj-$(CONFIG_DM_ZERO)           += dm-zero.o
 
 quiet_cmd_unroll = UNROLL  $@
diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index 34c25b0073ec..f6b20def2ac8 100644
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
@@ -777,7 +777,7 @@ int __init dm_dirty_log_init(void)
         return r;
 }
 
-void dm_dirty_log_exit(void)
+void __exit dm_dirty_log_exit(void)
 {
         dm_unregister_dirty_log_type(&_disk_type);
         dm_unregister_dirty_log_type(&_core_type);
@@ -787,3 +787,10 @@ EXPORT_SYMBOL(dm_register_dirty_log_type);
 EXPORT_SYMBOL(dm_unregister_dirty_log_type);
 EXPORT_SYMBOL(dm_create_dirty_log);
 EXPORT_SYMBOL(dm_destroy_dirty_log);
+
+module_init(dm_dirty_log_init);
+module_exit(dm_dirty_log_exit);
+
+MODULE_DESCRIPTION(DM_NAME " dirty region log");
+MODULE_AUTHOR("Joe Thornber, Heinz Mauelshagen <dm-devel@redhat.com>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 64489e714c95..c4ce01180b6f 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -1862,15 +1862,9 @@ static int __init dm_mirror_init(void)
 {
         int r;
 
-        r = dm_dirty_log_init();
-        if (r)
-                return r;
-
         r = dm_register_target(&mirror_target);
-        if (r < 0) {
+        if (r < 0)
                 DMERR("Failed to register mirror target");
-                dm_dirty_log_exit();
-        }
 
         return r;
 }
@@ -1882,8 +1876,6 @@ static void __exit dm_mirror_exit(void)
         r = dm_unregister_target(&mirror_target);
         if (r < 0)
                 DMERR("unregister failed %d", r);
-
-        dm_dirty_log_exit();
 }
 
 /* Module hooks */