Re: [tip:perf/core] tools lib api fs: Remove debugfs, tracefs and findfs objects

[Arnaldo Carvalho de Melo <acme@redhat.com>]

Em Mon, Sep 21, 2015 at 05:20:03PM -0700, Vinson Lee escreveu:
> On Mon, Sep 14, 2015 at 11:59 PM, tip-bot for Jiri Olsa
> <tipbot@zytor.com> wrote:
> > Commit-ID:  60a1133a5b39738671eff1e4d77bedc1ee3fa528
> > Gitweb:     http://git.kernel.org/tip/60a1133a5b39738671eff1e4d77bedc1ee3fa528
> > Author:     Jiri Olsa <jolsa@kernel.org>
> > AuthorDate: Wed, 2 Sep 2015 09:56:44 +0200
> > Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
> > CommitDate: Mon, 14 Sep 2015 12:50:15 -0300
> >
> > tools lib api fs: Remove debugfs, tracefs and findfs objects
> >
> > We have all the functionality in fs.c, let's remove unneeded
> > objects.
> >
> > Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> > Cc: David Ahern <dsahern@gmail.com>
> > Cc: Matt Fleming <matt@codeblueprint.co.uk>
> > Cc: Namhyung Kim <namhyung@kernel.org>
> > Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> > Cc: Raphael Beamonte <raphael.beamonte@gmail.com>
> > Cc: Steven Rostedt <rostedt@goodmis.org>
> > Link: http://lkml.kernel.org/r/1441180605-24737-15-git-send-email-jolsa@kernel.org
> > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> Hi.
> 
> This commit seems to have introduced a build failure with tools/vm.
> 
> $ make -C tools vm
> [...]
> gcc -Wall -Wextra -I../lib/ -o page-types page-types.c ../lib/api/libapi.a
> page-types.c:45:28: fatal error: api/fs/debugfs.h: No such file or directory
>  #include <api/fs/debugfs.h>

Can you please check if this solves the problem?

- Arnaldo

diff --git a/tools/vm/page-types.c b/tools/vm/page-types.c
index 7f73fa32a590..bcf5ec760eb9 100644
--- a/tools/vm/page-types.c
+++ b/tools/vm/page-types.c
@@ -42,7 +42,7 @@
 #include <sys/mman.h>
 #include "../../include/uapi/linux/magic.h"
 #include "../../include/uapi/linux/kernel-page-flags.h"
-#include <api/fs/debugfs.h>
+#include <api/fs/fs.h>
 
 #ifndef MAX_PATH
 # define MAX_PATH 256
@@ -188,7 +188,7 @@ static int		kpageflags_fd;
 static int		opt_hwpoison;
 static int		opt_unpoison;
 
-static char		*hwpoison_debug_fs;
+static const char	*hwpoison_debug_fs;
 static int		hwpoison_inject_fd;
 static int		hwpoison_forget_fd;
 
@@ -487,7 +487,7 @@ static void prepare_hwpoison_fd(void)
 {
 	char buf[MAX_PATH + 1];
 
-	hwpoison_debug_fs = debugfs_mount(NULL);
+	hwpoison_debug_fs = debugfs__mount();
 	if (!hwpoison_debug_fs) {
 		perror("mount debugfs");
 		exit(EXIT_FAILURE);