forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools lib fs: Pass filename to debugfs__strerror_open

Browse source 
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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2015-01-22 10:52:55 -03:00
commit 801c67b05f
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tools/lib/api/fs/debugfs.c
View file

@ -100,7 +100,7 @@ out:
return debugfs_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]; char sbuf[128];
@ -114,9 +114,9 @@ int debugfs__strerror_open(int err, char *buf, size_t size)
break; break;
case EACCES: case EACCES:
snprintf(buf, size, 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", "Hint:\tTry 'sudo mount -o remount,mode=755 %s'\n",
debugfs_mountpoint, debugfs_mountpoint); debugfs_mountpoint, filename, debugfs_mountpoint);
break; break;
default: default:
snprintf(buf, size, "%s", strerror_r(err, sbuf, sizeof(sbuf))); snprintf(buf, size, "%s", strerror_r(err, sbuf, sizeof(sbuf)));

2
tools/lib/api/fs/debugfs.h
View file

@ -26,6 +26,6 @@ char *debugfs_mount(const char *mountpoint);
extern char debugfs_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__ */ #endif /* __API_DEBUGFS_H__ */

5
tools/perf/builtin-trace.c
View file

@ -2056,7 +2056,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
if (trace->trace_syscalls && if (trace->trace_syscalls &&
perf_evlist__add_syscall_newtp(evlist, trace__sys_enter, perf_evlist__add_syscall_newtp(evlist, trace__sys_enter,
trace__sys_exit)) trace__sys_exit))
goto out_error_tp; goto out_error_raw_syscalls;
if (trace->trace_syscalls) if (trace->trace_syscalls)
perf_evlist__add_vfs_getname(evlist); perf_evlist__add_vfs_getname(evlist);
@ -2210,7 +2210,8 @@ out:
char errbuf[BUFSIZ]; char errbuf[BUFSIZ];
out_error_tp: 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; goto out_error;
out_error_mmap: out_error_mmap: