Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 801c67b0 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools lib fs: Pass filename to debugfs__strerror_open 

It was hardcoded for one specific tracepoint, leftover from its initial
user: 'perf trace'.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-j1jicvwljy5qx1nah4mkmyke@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e2726d99

tools/lib/api/fs/debugfs.c

+3 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ char *debugfs_mount(const char *mountpoint) 
	return debugfs_mountpoint;

}



int debugfs__strerror_open(int err, char *buf, size_t size)

int debugfs__strerror_open(int err, char *buf, size_t size, const char *filename)

{

	char sbuf[128];
@@ -114,9 +114,9 @@ int debugfs__strerror_open(int err, char *buf, size_t size) 
		break;

	case EACCES:

		snprintf(buf, size,

			 "Error:\tNo permissions to read %s/tracing/events/raw_syscalls\n"

			 "Error:\tNo permissions to read %s/%s\n"

			 "Hint:\tTry 'sudo mount -o remount,mode=755 %s'\n",

			 debugfs_mountpoint, debugfs_mountpoint);

			 debugfs_mountpoint, filename, debugfs_mountpoint);

		break;

	default:

		snprintf(buf, size, "%s", strerror_r(err, sbuf, sizeof(sbuf)));

tools/lib/api/fs/debugfs.h

+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,6 @@ char *debugfs_mount(const char *mountpoint); 


extern char debugfs_mountpoint[];



int debugfs__strerror_open(int err, char *buf, size_t size);

int debugfs__strerror_open(int err, char *buf, size_t size, const char *filename);



#endif /* __API_DEBUGFS_H__ */

tools/perf/builtin-trace.c

+3 −2
Original line number Diff line number Diff line
@@ -2056,7 +2056,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
	if (trace->trace_syscalls &&

	    perf_evlist__add_syscall_newtp(evlist, trace__sys_enter,

					   trace__sys_exit))

		goto out_error_tp;

		goto out_error_raw_syscalls;



	if (trace->trace_syscalls)

		perf_evlist__add_vfs_getname(evlist);
@@ -2210,7 +2210,8 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
	char errbuf[BUFSIZ];



out_error_tp:

	debugfs__strerror_open(errno, errbuf, sizeof(errbuf));

out_error_raw_syscalls:

	debugfs__strerror_open(errno, errbuf, sizeof(errbuf), "tracing/events/raw_syscalls");

	goto out_error;



out_error_mmap: