Remove debugfs file (keep only proc file)

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

diff --git a/ltt-events.c b/ltt-events.c
index 42299142ecf274b00ad758596b856ccf902a6186..03dbb2036af923e3c60841783bca3f46ac528c00 100644 (file)
--- a/ltt-events.c
+++ b/ltt-events.c
@@ -981,7 +981,7 @@ static int __init ltt_events_init(void)
        event_cache = KMEM_CACHE(ltt_event, 0);
        if (!event_cache)
                return -ENOMEM;
-       ret = ltt_debugfs_abi_init();
+       ret = lttng_abi_init();
        if (ret)
                goto error_abi;
        return 0;
@@ -996,7 +996,7 @@ static void __exit ltt_events_exit(void)
 {
        struct ltt_session *session, *tmpsession;
 
-       ltt_debugfs_abi_exit();
+       lttng_abi_exit();
        list_for_each_entry_safe(session, tmpsession, &sessions, list)
                ltt_session_destroy(session);
        kmem_cache_destroy(event_cache);

diff --git a/ltt-events.h b/ltt-events.h
index 955611e969e466e3414f2d7c90149f9833e2a17a..3aed0e217dfbc71d21db5f3db1252a659f2bf3dd 100644 (file)
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -298,8 +298,8 @@ void ltt_transport_register(struct ltt_transport *transport);
 void ltt_transport_unregister(struct ltt_transport *transport);
 
 void synchronize_trace(void);
-int ltt_debugfs_abi_init(void);
-void ltt_debugfs_abi_exit(void);
+int lttng_abi_init(void);
+void lttng_abi_exit(void);
 
 int ltt_probe_register(struct lttng_probe_desc *desc);
 void ltt_probe_unregister(struct lttng_probe_desc *desc);

diff --git a/lttng-abi.c b/lttng-abi.c
index df2b757a060bc8a743390874aed89eab45c40f67..ec16b7fcd82fba5b7cad783167bfbae735986857 100644 (file)
--- a/lttng-abi.c
+++ b/lttng-abi.c
@@ -25,7 +25,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/debugfs.h>
 #include <linux/proc_fs.h>
 #include <linux/anon_inodes.h>
 #include <linux/file.h>
@@ -40,10 +39,9 @@
 
 /*
  * This is LTTng's own personal way to create a system call as an external
- * module. We use ioctl() on /sys/kernel/debug/lttng.
+ * module. We use ioctl() on /proc/lttng.
  */
 
-static struct dentry *lttng_dentry;
 static struct proc_dir_entry *lttng_proc_dentry;
 static const struct file_operations lttng_fops;
 static const struct file_operations lttng_session_fops;
@@ -746,20 +744,15 @@ static const struct file_operations lttng_event_fops = {
 #endif
 };
 
-int __init ltt_debugfs_abi_init(void)
+int __init lttng_abi_init(void)
 {
        int ret = 0;
 
        wrapper_vmalloc_sync_all();
-       lttng_dentry = debugfs_create_file("lttng", S_IWUSR, NULL, NULL,
-                                       &lttng_fops);
-       if (IS_ERR(lttng_dentry))
-               lttng_dentry = NULL;
-
        lttng_proc_dentry = proc_create_data("lttng", S_IWUSR, NULL,
                                        &lttng_fops, NULL);
        
-       if (!lttng_dentry && !lttng_proc_dentry) {
+       if (lttng_proc_dentry) {
                printk(KERN_ERR "Error creating LTTng control file\n");
                ret = -ENOMEM;
                goto error;
@@ -768,10 +761,8 @@ error:
        return ret;
 }
 
-void __exit ltt_debugfs_abi_exit(void)
+void __exit lttng_abi_exit(void)
 {
-       if (lttng_dentry)
-               debugfs_remove(lttng_dentry);
        if (lttng_proc_dentry)
                remove_proc_entry("lttng", NULL);
 }

diff --git a/lttng-abi.h b/lttng-abi.h
index cb4898e30b29e75f6886baae978be91f6fbff93f..9c88b9b9db5887a57569d0265e1cb63e68d6ab81 100644 (file)
--- a/lttng-abi.h
+++ b/lttng-abi.h
@@ -6,7 +6,7 @@
  *
  * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * LTTng debugfs ABI header
+ * LTTng ABI header
  *
  * Dual LGPL v2.1/GPL v2 license.
  */