Attachment 295989 Details for Bug 434595 – make the dirty log code a standalone module

[patch] make the dirty log code a standalone module

linux-2.6-dm-make-dirty-log-modular.patch (text/plain), 5.01 KB, created by Jeff Moyer on 2008-02-26 20:20:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Moyer

Created: 2008-02-26 20:20:47 UTC

Size: 5.01 KB

patch

obsolete

>--- linux-2.6.18.x86_64/drivers/md/dm-log.h.orig	2008-02-26 15:17:11.000000000 -0500
>+++ linux-2.6.18.x86_64/drivers/md/dm-log.h	2008-02-26 15:17:15.000000000 -0500
>@@ -151,10 +151,4 @@ struct dirty_log *dm_create_dirty_log(co
> 				      unsigned int argc, char **argv);
> void dm_destroy_dirty_log(struct dirty_log *log);
> 
>-/*
>- * init/exit functions.
>- */
>-int dm_dirty_log_init(void);
>-void dm_dirty_log_exit(void);
>-
> #endif
>--- linux-2.6.18.x86_64/drivers/md/dm-raid1.c.orig	2008-02-26 15:17:11.000000000 -0500
>+++ linux-2.6.18.x86_64/drivers/md/dm-raid1.c	2008-02-26 15:17:15.000000000 -0500
>@@ -1777,16 +1777,10 @@ static int __init dm_mirror_init(void)
> 	if (!bio_map_info_pool)
> 		return -ENOMEM;
> 
>-	r = dm_dirty_log_init();
>-	if (r)
>-		return r;
>-
> 	r = dm_register_target(&mirror_target);
>-	if (r < 0) {
>+	if (r < 0)
> 		DMERR("%s: Failed to register mirror target",
> 		      mirror_target.name);
>-		dm_dirty_log_exit();
>-	}
> 
> 	return r;
> }
>@@ -1798,8 +1792,6 @@ static void __exit dm_mirror_exit(void)
> 	r = dm_unregister_target(&mirror_target);
> 	if (r < 0)
> 		DMERR("%s: unregister failed %d", mirror_target.name, r);
>-
>-	dm_dirty_log_exit();
> }
> 
> /* Module hooks */
>--- linux-2.6.18.x86_64/drivers/md/dm-log.c.orig	2008-02-26 15:17:11.000000000 -0500
>+++ linux-2.6.18.x86_64/drivers/md/dm-log.c	2008-02-26 15:18:47.000000000 -0500
>@@ -12,7 +12,7 @@
> #include "dm-log.h"
> #include "dm-io.h"
> 
>-#define DM_MSG_PREFIX "mirror log"
>+#define DM_MSG_PREFIX "dirty"
> 
> static LIST_HEAD(_log_types);
> static DEFINE_SPINLOCK(_lock);
>@@ -327,7 +327,7 @@ static int create_log_context(struct dir
> 	int r;
> 
> 	if (argc < 1 || argc > 3) {
>-		DMWARN("wrong number of arguments to mirror log");
>+		DMWARN("wrong number of arguments to dirty log");
> 		return -EINVAL;
> 	}
> 
>@@ -339,7 +339,7 @@ static int create_log_context(struct dir
> 		else if (!strcmp(argv[i], "block_on_error"))
> 			failure_response = DMLOG_IOERR_BLOCK;
> 		else {
>-			DMWARN("unrecognised sync argument to mirror log: %s",
>+			DMWARN("unrecognised sync argument to dirty log: %s",
> 			       argv[i]);
> 			return -EINVAL;
> 		}
>@@ -483,7 +483,7 @@ static int disk_ctr(struct dirty_log *lo
> 	struct dm_dev *dev;
> 
> 	if (argc < 2 || argc > 4) {
>-		DMWARN("wrong number of arguments to disk mirror log");
>+		DMWARN("wrong number of arguments to disk dirty log");
> 		return -EINVAL;
> 	}
> 
>@@ -548,7 +548,7 @@ static int disk_resume(struct dirty_log 
> 	 * Assume the worst in the event of failure.
> 	 */
> 	if (!lc->log_dev_failed && read_header(lc)) {
>-		DMWARN("Failed to read header on mirror log device, %s",
>+		DMWARN("Failed to read header on dirty log device, %s",
> 		       lc->log_dev->name);
> 		fail_log_device(lc);
> 		lc->header.nr_regions = 0;
>@@ -579,7 +579,7 @@ static int disk_resume(struct dirty_log 
> 	/* write the new header */
> 	r = write_header(lc);
> 	if (r) {
>-		DMWARN("Failed to write header on mirror log device, %s",
>+		DMWARN("Failed to write header on dirty log device, %s",
> 		       lc->log_dev->name);
> 		fail_log_device(lc);
> 	} else
>@@ -805,7 +805,7 @@ static struct dirty_log_type _disk_type 
> 	.get_failure_response = core_get_failure_response,
> };
> 
>-int __init dm_dirty_log_init(void)
>+static int __init dm_dirty_log_init(void)
> {
> 	int r;
> 
>@@ -822,7 +822,7 @@ int __init dm_dirty_log_init(void)
> 	return r;
> }
> 
>-void dm_dirty_log_exit(void)
>+static void __exit dm_dirty_log_exit(void)
> {
> 	dm_unregister_dirty_log_type(&_disk_type);
> 	dm_unregister_dirty_log_type(&_core_type);
>@@ -832,3 +832,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 log library");
>+MODULE_AUTHOR("Joe Thornber / Heinz Mauelshagen");
>+MODULE_LICENSE("GPL");
>--- linux-2.6.18.x86_64/drivers/md/Makefile.orig	2008-02-26 15:17:11.000000000 -0500
>+++ linux-2.6.18.x86_64/drivers/md/Makefile	2008-02-26 15:17:15.000000000 -0500
>@@ -6,7 +6,7 @@ dm-mod-objs	:= dm.o dm-table.o dm-target
> 		   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
>--- linux-2.6.18.x86_64/drivers/md/Kconfig.orig	2008-02-26 15:17:11.000000000 -0500
>+++ linux-2.6.18.x86_64/drivers/md/Kconfig	2008-02-26 15:17:15.000000000 -0500
>@@ -223,9 +223,16 @@ config DM_SNAPSHOT
>        ---help---
>          Allow volume managers to take writable snapshots of a device.
> 
>+config DM_LOG
>+       tristate "Dirty log library"
>+       depends on BLK_DEV_DM
>+       ---help---
>+         Dirty log library routines.
>+
> config DM_MIRROR
>        tristate "Mirror target (EXPERIMENTAL)"
>        depends on BLK_DEV_DM && EXPERIMENTAL
>+       select DM_LOG
>        ---help---
>          Allow volume managers to mirror logical volumes, also
>          needed for live data migration tools such as 'pvmove'.

Actions: View | Diff

Attachments on bug 434595: 295689 | 295989