Fix: load state dump even if work-around lookup fails

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index 35e18a473201b9756430055fd38278071cd50aa6..a633657a3966ca702410eac440c0def819fc8d17 100755 (executable)
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -426,7 +426,14 @@ EXPORT_SYMBOL_GPL(lttng_statedump_start);
 static
 int __init lttng_statedump_init(void)
 {
-       return wrapper_lttng_fixup_sig(THIS_MODULE);
+       /*
+        * Allow module to load even if the fixup cannot be done. This
+        * will allow seemless transition when the underlying issue fix
+        * is merged into the Linux kernel, and when tracepoint.c
+        * "tracepoint_module_notify" is turned into a static function.
+        */
+       (void) wrapper_lttng_fixup_sig(THIS_MODULE);
+       return 0;
 }
 
 module_init(lttng_statedump_init);

diff --git a/wrapper/tracepoint.h b/wrapper/tracepoint.h
index 60b36856e724e9b04125e6ef0970ed17939c4a63..5f429db7585ddb7c7edecf1abd359cb09bc15918 100644 (file)
--- a/wrapper/tracepoint.h
+++ b/wrapper/tracepoint.h
@@ -59,7 +59,7 @@ int wrapper_tracepoint_module_notify(struct notifier_block *nb,
        if (tracepoint_module_notify_sym) {
                return tracepoint_module_notify_sym(nb, val, mod);
        } else {
-               printk(KERN_WARNING "LTTng: tracepoint_module_notify symbol lookup failed.\n");
+               printk(KERN_WARNING "LTTng: tracepoint_module_notify symbol lookup failed. It probably means you kernel don't need this work-around. Please consider upgrading LTTng modules to make this warning go away.\n");
                return -ENOSYS;
        }
 }