diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/md/Makefile | 4 | ||||
-rw-r--r-- | drivers/md/dm-log.c | 9 | ||||
-rw-r--r-- | drivers/md/dm-raid1.c | 10 |
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 \ | |||
6 | dm-ioctl.o dm-io.o kcopyd.o | 6 | dm-ioctl.o dm-io.o kcopyd.o |
7 | dm-multipath-objs := dm-hw-handler.o dm-path-selector.o dm-mpath.o | 7 | dm-multipath-objs := dm-hw-handler.o dm-path-selector.o dm-mpath.o |
8 | dm-snapshot-objs := dm-snap.o dm-exception-store.o | 8 | dm-snapshot-objs := dm-snap.o dm-exception-store.o |
9 | dm-mirror-objs := dm-log.o dm-raid1.o | 9 | dm-mirror-objs := dm-raid1.o |
10 | dm-rdac-objs := dm-mpath-rdac.o | 10 | dm-rdac-objs := dm-mpath-rdac.o |
11 | dm-hp-sw-objs := dm-mpath-hp-sw.o | 11 | dm-hp-sw-objs := dm-mpath-hp-sw.o |
12 | md-mod-objs := md.o bitmap.o | 12 | md-mod-objs := md.o bitmap.o |
@@ -39,7 +39,7 @@ obj-$(CONFIG_DM_MULTIPATH_EMC) += dm-emc.o | |||
39 | obj-$(CONFIG_DM_MULTIPATH_HP) += dm-hp-sw.o | 39 | obj-$(CONFIG_DM_MULTIPATH_HP) += dm-hp-sw.o |
40 | obj-$(CONFIG_DM_MULTIPATH_RDAC) += dm-rdac.o | 40 | obj-$(CONFIG_DM_MULTIPATH_RDAC) += dm-rdac.o |
41 | obj-$(CONFIG_DM_SNAPSHOT) += dm-snapshot.o | 41 | obj-$(CONFIG_DM_SNAPSHOT) += dm-snapshot.o |
42 | obj-$(CONFIG_DM_MIRROR) += dm-mirror.o | 42 | obj-$(CONFIG_DM_MIRROR) += dm-mirror.o dm-log.o |
43 | obj-$(CONFIG_DM_ZERO) += dm-zero.o | 43 | obj-$(CONFIG_DM_ZERO) += dm-zero.o |
44 | 44 | ||
45 | quiet_cmd_unroll = UNROLL $@ | 45 | 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) | |||
777 | return r; | 777 | return r; |
778 | } | 778 | } |
779 | 779 | ||
780 | void dm_dirty_log_exit(void) | 780 | void __exit dm_dirty_log_exit(void) |
781 | { | 781 | { |
782 | dm_unregister_dirty_log_type(&_disk_type); | 782 | dm_unregister_dirty_log_type(&_disk_type); |
783 | dm_unregister_dirty_log_type(&_core_type); | 783 | dm_unregister_dirty_log_type(&_core_type); |
@@ -787,3 +787,10 @@ EXPORT_SYMBOL(dm_register_dirty_log_type); | |||
787 | EXPORT_SYMBOL(dm_unregister_dirty_log_type); | 787 | EXPORT_SYMBOL(dm_unregister_dirty_log_type); |
788 | EXPORT_SYMBOL(dm_create_dirty_log); | 788 | EXPORT_SYMBOL(dm_create_dirty_log); |
789 | EXPORT_SYMBOL(dm_destroy_dirty_log); | 789 | EXPORT_SYMBOL(dm_destroy_dirty_log); |
790 | |||
791 | module_init(dm_dirty_log_init); | ||
792 | module_exit(dm_dirty_log_exit); | ||
793 | |||
794 | MODULE_DESCRIPTION(DM_NAME " dirty region log"); | ||
795 | MODULE_AUTHOR("Joe Thornber, Heinz Mauelshagen <dm-devel@redhat.com>"); | ||
796 | 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) | |||
1862 | { | 1862 | { |
1863 | int r; | 1863 | int r; |
1864 | 1864 | ||
1865 | r = dm_dirty_log_init(); | ||
1866 | if (r) | ||
1867 | return r; | ||
1868 | |||
1869 | r = dm_register_target(&mirror_target); | 1865 | r = dm_register_target(&mirror_target); |
1870 | if (r < 0) { | 1866 | if (r < 0) |
1871 | DMERR("Failed to register mirror target"); | 1867 | DMERR("Failed to register mirror target"); |
1872 | dm_dirty_log_exit(); | ||
1873 | } | ||
1874 | 1868 | ||
1875 | return r; | 1869 | return r; |
1876 | } | 1870 | } |
@@ -1882,8 +1876,6 @@ static void __exit dm_mirror_exit(void) | |||
1882 | r = dm_unregister_target(&mirror_target); | 1876 | r = dm_unregister_target(&mirror_target); |
1883 | if (r < 0) | 1877 | if (r < 0) |
1884 | DMERR("unregister failed %d", r); | 1878 | DMERR("unregister failed %d", r); |
1885 | |||
1886 | dm_dirty_log_exit(); | ||
1887 | } | 1879 | } |
1888 | 1880 | ||
1889 | /* Module hooks */ | 1881 | /* Module hooks */ |