perf trace: Clean up find_debugfs()

Remove redundant code for 'perf trace'

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Clark Williams <williams@redhat.com>
Cc: John Kacur <jkacur@redhat.com>
LKML-Reference: <4B3870DE.7090500@cn.fujitsu.com>
[ v2: resolved conflicts with recent changes ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/tools/perf/util/debugfs.c b/tools/perf/util/debugfs.c
index 1f805fde5fd4b6f0fc32e9776409463730996573..a88fefc0cc0ada1afdbf8fc133cca9f8d49fe5a3 100644 (file)
--- a/tools/perf/util/debugfs.c
+++ b/tools/perf/util/debugfs.c
@@ -130,6 +130,7 @@ char *debugfs_mount(const char *mountpoint)
 
        /* save the mountpoint */
        strncpy(debugfs_mountpoint, mountpoint, sizeof(debugfs_mountpoint));
+       debugfs_found = 1;
 
        return debugfs_mountpoint;
 }

diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
index dfef238ce1582152a3a64c5bdefa5b0c5409315d..535176dc95b6e9b54cf1173401af189c95c1d30b 100644 (file)
--- a/tools/perf/util/trace-event-info.c
+++ b/tools/perf/util/trace-event-info.c
@@ -38,6 +38,7 @@
 
 #include "../perf.h"
 #include "trace-event.h"
+#include "debugfs.h"
 
 #define VERSION "0.5"
 
@@ -102,32 +103,12 @@ void *malloc_or_die(unsigned int size)
 
 static const char *find_debugfs(void)
 {
-       static char debugfs[MAX_PATH+1];
-       static int debugfs_found;
-       FILE *fp;
-       struct mntent *m;
-
-       if (debugfs_found)
-               return debugfs;
-
-       fp = setmntent("/proc/mounts", "r");
-       if (!fp)
-               die("Can't open /proc/mounts for read");
-
-       while ((m = getmntent(fp)) != NULL) {
-               if (strcmp(m->mnt_type, "debugfs") == 0) {
-                       strcpy(debugfs, m->mnt_dir);
-                       debugfs_found = 1;
-                       break;
-               }
-       }
-
-       endmntent(fp);
+       const char *path = debugfs_mount(NULL);
 
-       if (!debugfs_found)
-               die("debugfs not mounted, please mount");
+       if (!path)
+               die("Your kernel not support debugfs filesystem");
 
-       return debugfs;
+       return path;
 }
 
 /*