[REFACTOR] new interface dbi_unregister_kprobe()

-void dbi_unregister_kprobe(struct kprobe *p, struct task_struct *task)
+void dbi_unregister_kprobe(struct kprobe *p)

diff --git a/kprobe/dbi_kprobes.c b/kprobe/dbi_kprobes.c
index 208d88e..e078166 100644 (file)
--- a/kprobe/dbi_kprobes.c
+++ b/kprobe/dbi_kprobes.c
@@ -531,7 +531,7 @@ out:
        return ret;
 }
 
-void dbi_unregister_kprobe(struct kprobe *p, struct task_struct *task)
+void dbi_unregister_kprobe(struct kprobe *p)
 {
        struct kprobe *old_p, *list_p;
        int cleanup_p;
@@ -602,7 +602,7 @@ int dbi_register_jprobe(struct jprobe *jp)
 
 void dbi_unregister_jprobe(struct jprobe *jp)
 {
-       dbi_unregister_kprobe(&jp->kp, NULL);
+       dbi_unregister_kprobe(&jp->kp);
 }
 
 /*
@@ -830,7 +830,7 @@ void dbi_unregister_kretprobe(struct kretprobe *rp)
        unsigned long flags;
        struct kretprobe_instance *ri;
 
-       dbi_unregister_kprobe(&rp->kp, NULL);
+       dbi_unregister_kprobe(&rp->kp);
 
        /* No race here */
        spin_lock_irqsave(&kretprobe_lock, flags);

diff --git a/kprobe/dbi_kprobes.h b/kprobe/dbi_kprobes.h
index aee368d..460375a 100644 (file)
--- a/kprobe/dbi_kprobes.h
+++ b/kprobe/dbi_kprobes.h
@@ -241,7 +241,7 @@ struct hlist_head *kretprobe_inst_table_head (void *hash_key);
 
 
 int dbi_register_kprobe (struct kprobe *p);
-void dbi_unregister_kprobe (struct kprobe *p, struct task_struct *task);
+void dbi_unregister_kprobe(struct kprobe *p);
 
 int register_aggr_kprobe (struct kprobe *old_p, struct kprobe *p);
 

diff --git a/us_manager/helper.c b/us_manager/helper.c
index 8c0ef56..0c4307b 100644 (file)
--- a/us_manager/helper.c
+++ b/us_manager/helper.c
@@ -305,10 +305,10 @@ unregister_cp:
        dbi_unregister_kretprobe(&cp_kretprobe);
 
 unregister_mr:
-       dbi_unregister_kprobe(&mr_kprobe, NULL);
+       dbi_unregister_kprobe(&mr_kprobe);
 
 unregister_unmap:
-       dbi_unregister_kprobe(&unmap_kprobe, NULL);
+       dbi_unregister_kprobe(&unmap_kprobe);
 
        return ret;
 }
@@ -322,10 +322,10 @@ void unregister_helper(void)
        dbi_unregister_kretprobe(&cp_kretprobe);
 
        /* uninstall kprobe with 'mm_release' */
-       dbi_unregister_kprobe(&mr_kprobe, NULL);
+       dbi_unregister_kprobe(&mr_kprobe);
 
        /* uninstall kprobe with 'do_munmap' */
-       dbi_unregister_kprobe(&unmap_kprobe, NULL);
+       dbi_unregister_kprobe(&unmap_kprobe);
 }
 
 int init_helper(void)