LVM2/lib/raid raid.c

LVM2/lib/raid raid.c

[mbroz]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	mbroz@sourceware.org	2011-08-11 13:30:36

Modified files:
	lib/raid       : raid.c 

Log message:
	Fix build of raid without dmeventd.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/raid/raid.c.diff?cvsroot=lvm2&r1=1.2&r2=1.3

--- LVM2/lib/raid/raid.c	2011/08/11 05:00:22	1.2
+++ LVM2/lib/raid/raid.c	2011/08/11 13:30:36	1.3
@@ -302,13 +302,17 @@
 	.text_export = _raid_text_export,
 	.add_target_line = _raid_add_target_line,
 	.target_status_compatible = _raid_target_status_compatible,
+#ifdef DEVMAPPER_SUPPORT
 	.target_percent = _raid_target_percent,
 	.target_present = _raid_target_present,
-	.modules_needed = _raid_modules_needed,
-	.destroy = _raid_destroy,
+#  ifdef DMEVENTD
 	.target_monitored = _raid_target_monitored,
 	.target_monitor_events = _raid_target_monitor_events,
 	.target_unmonitor_events = _raid_target_unmonitor_events,
+#  endif        /* DMEVENTD */
+#endif
+	.modules_needed = _raid_modules_needed,
+	.destroy = _raid_destroy,
 };
 
 static struct segment_type *init_raid_segtype(struct cmd_context *cmd,

LVM2/lib/raid raid.c

[jbrassow]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	jbrassow@sourceware.org	2011-08-11 14:00:58

Modified files:
	lib/raid       : raid.c 

Log message:
	Need 'ifdef' checks around RAID monitoring functions as well to catch the
	case where the user does not want dmeventd support compiled in.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/raid/raid.c.diff?cvsroot=lvm2&r1=1.3&r2=1.4

--- LVM2/lib/raid/raid.c	2011/08/11 13:30:36	1.3
+++ LVM2/lib/raid/raid.c	2011/08/11 14:00:58	1.4
@@ -262,6 +262,8 @@
 	dm_free((void *) segtype);
 }
 
+#ifdef DEVMAPPER_SUPPORT
+#ifdef DMEVENTD
 static const char *_get_raid_dso_path(struct cmd_context *cmd)
 {
 	const char *config_str = find_config_tree_str(cmd, "dmeventd/raid_library",
@@ -294,7 +296,8 @@
 {
 	return _raid_set_events(seg, events, 0);
 }
-
+#endif /* DEVMAPPER_SUPPORT */
+#endif /* DMEVENTD */
 static struct segtype_handler _raid_ops = {
 	.name = _raid_name,
 	.text_import_area_count = _raid_text_import_area_count,