[PATCH 14/15] tools lib api: Remove debugfs, tracefs and findfs objects

[Jiri Olsa]

We have all the functionality in fs.c, let's remove unneeded
objects.

Link: http://lkml.kernel.org/n/tip-4ylqs27bec3m6ofefqo0e...@git.kernel.org
Signed-off-by: Jiri Olsa 
---
 tools/lib/api/fs/Build |  3 --
 tools/lib/api/fs/debugfs.c | 77 -
 tools/lib/api/fs/debugfs.h | 23 --
 tools/lib/api/fs/findfs.c  | 63 -
 tools/lib/api/fs/findfs.h  | 23 --
 tools/lib/api/fs/tracefs.c | 78 --
 tools/lib/api/fs/tracefs.h | 21 -
 7 files changed, 288 deletions(-)
 delete mode 100644 tools/lib/api/fs/debugfs.c
 delete mode 100644 tools/lib/api/fs/debugfs.h
 delete mode 100644 tools/lib/api/fs/findfs.c
 delete mode 100644 tools/lib/api/fs/findfs.h
 delete mode 100644 tools/lib/api/fs/tracefs.c
 delete mode 100644 tools/lib/api/fs/tracefs.h

diff --git a/tools/lib/api/fs/Build b/tools/lib/api/fs/Build
index fa726f679b29..f4ed9629ae85 100644
--- a/tools/lib/api/fs/Build
+++ b/tools/lib/api/fs/Build
@@ -1,5 +1,2 @@
 libapi-y += fs.o
 libapi-y += tracing_path.o
-libapi-y += debugfs.o
-libapi-y += findfs.o
-libapi-y += tracefs.o
diff --git a/tools/lib/api/fs/debugfs.c b/tools/lib/api/fs/debugfs.c
deleted file mode 100644
index c707cfb32782..
--- a/tools/lib/api/fs/debugfs.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#define _GNU_SOURCE
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "debugfs.h"
-#include "tracefs.h"
-
-#ifndef DEBUGFS_DEFAULT_PATH
-#define DEBUGFS_DEFAULT_PATH   "/sys/kernel/debug"
-#endif
-
-char debugfs_mountpoint[PATH_MAX + 1] = DEBUGFS_DEFAULT_PATH;
-
-static const char * const debugfs_known_mountpoints[] = {
-   DEBUGFS_DEFAULT_PATH,
-   "/debug",
-   0,
-};
-
-static bool debugfs_found;
-
-bool debugfs_configured(void)
-{
-   return debugfs_find_mountpoint() != NULL;
-}
-
-/* find the path to the mounted debugfs */
-const char *debugfs_find_mountpoint(void)
-{
-   const char *ret;
-
-   if (debugfs_found)
-   return (const char *)debugfs_mountpoint;
-
-   ret = find_mountpoint("debugfs", (long) DEBUGFS_MAGIC,
- debugfs_mountpoint, PATH_MAX + 1,
- debugfs_known_mountpoints);
-   if (ret)
-   debugfs_found = true;
-
-   return ret;
-}
-
-/* mount the debugfs somewhere if it's not mounted */
-char *debugfs_mount(const char *mountpoint)
-{
-   /* see if it's already mounted */
-   if (debugfs_find_mountpoint())
-   goto out;
-
-   /* if not mounted and no argument */
-   if (mountpoint == NULL) {
-   /* see if environment variable set */
-   mountpoint = getenv(PERF_DEBUGFS_ENVIRONMENT);
-   /* if no environment variable, use default */
-   if (mountpoint == NULL)
-   mountpoint = DEBUGFS_DEFAULT_PATH;
-   }
-
-   if (mount(NULL, mountpoint, "debugfs", 0, NULL) < 0)
-   return NULL;
-
-   /* save the mountpoint */
-   debugfs_found = true;
-   strncpy(debugfs_mountpoint, mountpoint, sizeof(debugfs_mountpoint));
-out:
-   return debugfs_mountpoint;
-}
diff --git a/tools/lib/api/fs/debugfs.h b/tools/lib/api/fs/debugfs.h
deleted file mode 100644
index 455023698d2b..
--- a/tools/lib/api/fs/debugfs.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __API_DEBUGFS_H__
-#define __API_DEBUGFS_H__
-
-#include "findfs.h"
-
-#ifndef DEBUGFS_MAGIC
-#define DEBUGFS_MAGIC  0x64626720
-#endif
-
-#ifndef PERF_DEBUGFS_ENVIRONMENT
-#define PERF_DEBUGFS_ENVIRONMENT "PERF_DEBUGFS_DIR"
-#endif
-
-bool debugfs_configured(void);
-const char *debugfs_find_mountpoint(void);
-char *debugfs_mount(const char *mountpoint);
-
-extern char debugfs_mountpoint[];
-
-int debugfs__strerror_open(int err, char *buf, size_t size, const char 
*filename);
-int debugfs__strerror_open_tp(int err, char *buf, size_t size, const char 
*sys, const char *name);
-
-#endif /* __API_DEBUGFS_H__ */
diff --git a/tools/lib/api/fs/findfs.c b/tools/lib/api/fs/findfs.c
deleted file mode 100644
index 49946cb6d7af..
--- a/tools/lib/api/fs/findfs.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "findfs.h"
-
-/* verify that a mountpoint is actually the type we want */
-
-int valid_mountpoint(const char *mount, long magic)
-{
-   struct statfs st_fs;
-
-   if (statfs(mount, _fs) < 0)
-   return -ENOENT;
-   else if ((long)st_fs.f_type != magic)
-   return -ENOENT;
-
-   return 0;
-}
-
-/* find the path to a mounted file system */
-const char *find_mountpoint(const char *fstype, long magic,
-   char *mountpoint, int len,
-   const char * const *known_mountpoints)
-{
-   const char * const *ptr;
-  

[PATCH 14/15] tools lib api: Remove debugfs, tracefs and findfs objects

[Jiri Olsa]

We have all the functionality in fs.c, let's remove unneeded
objects.

Link: http://lkml.kernel.org/n/tip-4ylqs27bec3m6ofefqo0e...@git.kernel.org
Signed-off-by: Jiri Olsa 
---
 tools/lib/api/fs/Build |  3 --
 tools/lib/api/fs/debugfs.c | 77 -
 tools/lib/api/fs/debugfs.h | 23 --
 tools/lib/api/fs/findfs.c  | 63 -
 tools/lib/api/fs/findfs.h  | 23 --
 tools/lib/api/fs/tracefs.c | 78 --
 tools/lib/api/fs/tracefs.h | 21 -
 7 files changed, 288 deletions(-)
 delete mode 100644 tools/lib/api/fs/debugfs.c
 delete mode 100644 tools/lib/api/fs/debugfs.h
 delete mode 100644 tools/lib/api/fs/findfs.c
 delete mode 100644 tools/lib/api/fs/findfs.h
 delete mode 100644 tools/lib/api/fs/tracefs.c
 delete mode 100644 tools/lib/api/fs/tracefs.h

diff --git a/tools/lib/api/fs/Build b/tools/lib/api/fs/Build
index fa726f679b29..f4ed9629ae85 100644
--- a/tools/lib/api/fs/Build
+++ b/tools/lib/api/fs/Build
@@ -1,5 +1,2 @@
 libapi-y += fs.o
 libapi-y += tracing_path.o
-libapi-y += debugfs.o
-libapi-y += findfs.o
-libapi-y += tracefs.o
diff --git a/tools/lib/api/fs/debugfs.c b/tools/lib/api/fs/debugfs.c
deleted file mode 100644
index c707cfb32782..
--- a/tools/lib/api/fs/debugfs.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#define _GNU_SOURCE
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "debugfs.h"
-#include "tracefs.h"
-
-#ifndef DEBUGFS_DEFAULT_PATH
-#define DEBUGFS_DEFAULT_PATH   "/sys/kernel/debug"
-#endif
-
-char debugfs_mountpoint[PATH_MAX + 1] = DEBUGFS_DEFAULT_PATH;
-
-static const char * const debugfs_known_mountpoints[] = {
-   DEBUGFS_DEFAULT_PATH,
-   "/debug",
-   0,
-};
-
-static bool debugfs_found;
-
-bool debugfs_configured(void)
-{
-   return debugfs_find_mountpoint() != NULL;
-}
-
-/* find the path to the mounted debugfs */
-const char *debugfs_find_mountpoint(void)
-{
-   const char *ret;
-
-   if (debugfs_found)
-   return (const char *)debugfs_mountpoint;
-
-   ret = find_mountpoint("debugfs", (long) DEBUGFS_MAGIC,
- debugfs_mountpoint, PATH_MAX + 1,
- debugfs_known_mountpoints);
-   if (ret)
-   debugfs_found = true;
-
-   return ret;
-}
-
-/* mount the debugfs somewhere if it's not mounted */
-char *debugfs_mount(const char *mountpoint)
-{
-   /* see if it's already mounted */
-   if (debugfs_find_mountpoint())
-   goto out;
-
-   /* if not mounted and no argument */
-   if (mountpoint == NULL) {
-   /* see if environment variable set */
-   mountpoint = getenv(PERF_DEBUGFS_ENVIRONMENT);
-   /* if no environment variable, use default */
-   if (mountpoint == NULL)
-   mountpoint = DEBUGFS_DEFAULT_PATH;
-   }
-
-   if (mount(NULL, mountpoint, "debugfs", 0, NULL) < 0)
-   return NULL;
-
-   /* save the mountpoint */
-   debugfs_found = true;
-   strncpy(debugfs_mountpoint, mountpoint, sizeof(debugfs_mountpoint));
-out:
-   return debugfs_mountpoint;
-}
diff --git a/tools/lib/api/fs/debugfs.h b/tools/lib/api/fs/debugfs.h
deleted file mode 100644
index 455023698d2b..
--- a/tools/lib/api/fs/debugfs.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __API_DEBUGFS_H__
-#define __API_DEBUGFS_H__
-
-#include "findfs.h"
-
-#ifndef DEBUGFS_MAGIC
-#define DEBUGFS_MAGIC  0x64626720
-#endif
-
-#ifndef PERF_DEBUGFS_ENVIRONMENT
-#define PERF_DEBUGFS_ENVIRONMENT "PERF_DEBUGFS_DIR"
-#endif
-
-bool debugfs_configured(void);
-const char *debugfs_find_mountpoint(void);
-char *debugfs_mount(const char *mountpoint);
-
-extern char debugfs_mountpoint[];
-
-int debugfs__strerror_open(int err, char *buf, size_t size, const char 
*filename);
-int debugfs__strerror_open_tp(int err, char *buf, size_t size, const char 
*sys, const char *name);
-
-#endif /* __API_DEBUGFS_H__ */
diff --git a/tools/lib/api/fs/findfs.c b/tools/lib/api/fs/findfs.c
deleted file mode 100644
index 49946cb6d7af..
--- a/tools/lib/api/fs/findfs.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#include "findfs.h"
-
-/* verify that a mountpoint is actually the type we want */
-
-int valid_mountpoint(const char *mount, long magic)
-{
-   struct statfs st_fs;
-
-   if (statfs(mount, _fs) < 0)
-   return -ENOENT;
-   else if ((long)st_fs.f_type != magic)
-   return -ENOENT;
-
-   return 0;
-}
-
-/* find the path to a mounted file system */
-const char *find_mountpoint(const char *fstype, long magic,
-   char *mountpoint, int len,
-   const char * const *known_mountpoints)
-{
-   const