Fix regression in thin monitoring

Patch https://www.redhat.com/archives/lvm-devel/2012-February/msg00118.html
removed initilization of thin volume monitoring, leaving it only for
thin pool - but missed the code move part for monitoring of thin pools.
Effectively making thin pools not monitorable.

diff --git a/WHATS_NEW b/WHATS_NEW
index c3c5296a19f0922681b23c7329281b0add1e4e89..52dc61960d8e89205eb583c57625171c4e0c5f9a 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.96 - 
 ================================
+  Fix initializiation of thin monitoring (2.02.92).
   Support improperly formated device numbers in /proc/devices (2.02.91).
   Fix fsadm propagation of -e option.
   Fix fsadm parsing of /proc/mounts files (don't check for substrings).

diff --git a/lib/thin/thin.c b/lib/thin/thin.c
index 8d55da6d74b97d4c0794930e7c5f337156f25db3..47fb0ec4eb0f7424ed74b78764fb10aa4a1832d9 100644 (file)
--- a/lib/thin/thin.c
+++ b/lib/thin/thin.c
@@ -337,6 +337,43 @@ static int _thin_pool_target_percent(void **target_state __attribute__((unused))
 
        return 1;
 }
+
+#  ifdef DMEVENTD
+static const char *_get_thin_dso_path(struct cmd_context *cmd)
+{
+       return get_monitor_dso_path(cmd, find_config_tree_str(cmd, "dmeventd/thin_library",
+                                                             DEFAULT_DMEVENTD_THIN_LIB));
+}
+
+/* FIXME Cache this */
+static int _target_registered(struct lv_segment *seg, int *pending)
+{
+       return target_registered_with_dmeventd(seg->lv->vg->cmd,
+                                              _get_thin_dso_path(seg->lv->vg->cmd),
+                                              seg->lv, pending);
+}
+
+/* FIXME This gets run while suspended and performs banned operations. */
+static int _target_set_events(struct lv_segment *seg, int evmask, int set)
+{
+       /* FIXME Make timeout (10) configurable */
+       return target_register_events(seg->lv->vg->cmd,
+                                     _get_thin_dso_path(seg->lv->vg->cmd),
+                                     seg->lv, evmask, set, 10);
+}
+
+static int _target_register_events(struct lv_segment *seg,
+                                  int events)
+{
+       return _target_set_events(seg, events, 1);
+}
+
+static int _target_unregister_events(struct lv_segment *seg,
+                                    int events)
+{
+       return _target_set_events(seg, events, 0);
+}
+#  endif /* DMEVENTD */
 #endif /* DEVMAPPER_SUPPORT */
 
 static const char *_thin_name(const struct lv_segment *seg)
@@ -462,43 +499,6 @@ static int _thin_target_present(struct cmd_context *cmd,
 
        return _present;
 }
-
-#  ifdef DMEVENTD
-static const char *_get_thin_dso_path(struct cmd_context *cmd)
-{
-       return get_monitor_dso_path(cmd, find_config_tree_str(cmd, "dmeventd/thin_library",
-                                                             DEFAULT_DMEVENTD_THIN_LIB));
-}
-
-/* FIXME Cache this */
-static int _target_registered(struct lv_segment *seg, int *pending)
-{
-       return target_registered_with_dmeventd(seg->lv->vg->cmd,
-                                              _get_thin_dso_path(seg->lv->vg->cmd),
-                                              seg->pool_lv, pending);
-}
-
-/* FIXME This gets run while suspended and performs banned operations. */
-static int _target_set_events(struct lv_segment *seg, int evmask, int set)
-{
-       /* FIXME Make timeout (10) configurable */
-       return target_register_events(seg->lv->vg->cmd,
-                                     _get_thin_dso_path(seg->lv->vg->cmd),
-                                     seg->pool_lv, evmask, set, 10);
-}
-
-static int _target_register_events(struct lv_segment *seg,
-                                  int events)
-{
-       return _target_set_events(seg, events, 1);
-}
-
-static int _target_unregister_events(struct lv_segment *seg,
-                                    int events)
-{
-       return _target_set_events(seg, events, 0);
-}
-#  endif /* DMEVENTD */
 #endif
 
 static int _thin_modules_needed(struct dm_pool *mem,
@@ -527,6 +527,11 @@ static struct segtype_handler _thin_pool_ops = {
        .add_target_line = _thin_pool_add_target_line,
        .target_percent = _thin_pool_target_percent,
        .target_present = _thin_target_present,
+#  ifdef DMEVENTD
+       .target_monitored = _target_registered,
+       .target_monitor_events = _target_register_events,
+       .target_unmonitor_events = _target_unregister_events,
+#  endif /* DMEVENTD */
 #endif
        .modules_needed = _thin_modules_needed,
        .destroy = _thin_destroy,
@@ -540,11 +545,6 @@ static struct segtype_handler _thin_ops = {
        .add_target_line = _thin_add_target_line,
        .target_percent = _thin_target_percent,
        .target_present = _thin_target_present,
-#  ifdef DMEVENTD
-       .target_monitored = _target_registered,
-       .target_monitor_events = _target_register_events,
-       .target_unmonitor_events = _target_unregister_events,
-#  endif /* DMEVENTD */
 #endif
        .modules_needed = _thin_modules_needed,
        .destroy = _thin_destroy,