add ddebug_zpool_remove() to undo ddebug_zpool_add(), and call it from
ddebug_remove_module().

Signed-off-by: Jim Cromie <jim.cro...@gmail.com>
---
 lib/dynamic_debug.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 049299027fb3..102f47b2a439 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -1007,6 +1007,18 @@ static void ddebug_zpool_add(struct _ddebug *dp)
        zs_unmap_object(dd_callsite_zpool, handle);
 }
 
+static void ddebug_zpool_remove(struct _ddebug *dp)
+{
+       if (dp->site) {
+               pr_warn("zhandle shouldnt be mapped now\n");
+               zs_unmap_object(dd_callsite_zpool, dp->zhandle);
+       }
+       if (!dp->zhandle)
+               pr_err("zhandle already cleared !\n");
+       else
+               zs_free(dd_callsite_zpool, dp->zhandle);
+}
+
 /*
  * Allocate a new ddebug_table for the given module
  * and add it to the global list.
@@ -1104,6 +1116,13 @@ int ddebug_remove_module(const char *mod_name)
        mutex_lock(&ddebug_lock);
        list_for_each_entry_safe(dt, nextdt, &ddebug_tables, link) {
                if (dt->mod_name == mod_name) {
+
+                       unsigned int n = dt->num_ddebugs;
+                       struct _ddebug *dp = dt->ddebugs;
+
+                       for (; n; n--, dp++)
+                               ddebug_zpool_remove(dp);
+
                        ddebug_table_free(dt);
                        ret = 0;
                        break;
-- 
2.26.2

Reply via email to