Handle refcount of modules having dynamically alloc event description

[lttng-modules.git] / ltt-probes.c

diff --git a/ltt-probes.c b/ltt-probes.c
index dbdb50d402a2f7bbecd06a203d03fe46a3b85300..0efc23c5c61b749c996783f604c26a537d822416 100644 (file)
--- a/ltt-probes.c
+++ b/ltt-probes.c
@@ -30,11 +30,6 @@ const struct lttng_event_desc *find_event(const char *name)
        return NULL;
 }
 
-/*
- * TODO: registration of probe descriptions in dynamically allocated memory (not
- * directly in a module memory) will require some care for refcounting: it's
- * currently done by just refcounting the module in event_get/put.
- */
 int ltt_probe_register(struct lttng_probe_desc *desc)
 {
        int ret = 0;
@@ -73,18 +68,17 @@ const struct lttng_event_desc *ltt_event_get(const char *name)
 
        mutex_lock(&probe_mutex);
        event = find_event(name);
+       mutex_unlock(&probe_mutex);
        if (!event)
-               goto end;
-       ret = try_module_get(__module_text_address((unsigned long) event));
+               return NULL;
+       ret = try_module_get(event->owner);
        WARN_ON_ONCE(!ret);
-end:
-       mutex_unlock(&probe_mutex);
        return event;
 }
 EXPORT_SYMBOL_GPL(ltt_event_get);
 
 void ltt_event_put(const struct lttng_event_desc *event)
 {
-       module_put(__module_text_address((unsigned long) event));
+       module_put(event->owner);
 }
 EXPORT_SYMBOL_GPL(ltt_event_put);