Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
tools
/
perf
/
util
/
pmu.c
diff --git
a/kernel/tools/perf/util/pmu.c
b/kernel/tools/perf/util/pmu.c
index
e4b173d
..
6f2a027
100644
(file)
--- a/
kernel/tools/perf/util/pmu.c
+++ b/
kernel/tools/perf/util/pmu.c
@@
-283,13
+283,12
@@
static int pmu_aliases_parse(char *dir, struct list_head *head)
{
struct dirent *evt_ent;
DIR *event_dir;
{
struct dirent *evt_ent;
DIR *event_dir;
- int ret = 0;
event_dir = opendir(dir);
if (!event_dir)
return -EINVAL;
event_dir = opendir(dir);
if (!event_dir)
return -EINVAL;
- while (
!ret &&
(evt_ent = readdir(event_dir))) {
+ while ((evt_ent = readdir(event_dir))) {
char path[PATH_MAX];
char *name = evt_ent->d_name;
FILE *file;
char path[PATH_MAX];
char *name = evt_ent->d_name;
FILE *file;
@@
-305,17
+304,19
@@
static int pmu_aliases_parse(char *dir, struct list_head *head)
snprintf(path, PATH_MAX, "%s/%s", dir, name);
snprintf(path, PATH_MAX, "%s/%s", dir, name);
- ret = -EINVAL;
file = fopen(path, "r");
file = fopen(path, "r");
- if (!file)
- break;
+ if (!file) {
+ pr_debug("Cannot open %s\n", path);
+ continue;
+ }
- ret = perf_pmu__new_alias(head, dir, name, file);
+ if (perf_pmu__new_alias(head, dir, name, file) < 0)
+ pr_debug("Cannot set up %s\n", name);
fclose(file);
}
closedir(event_dir);
fclose(file);
}
closedir(event_dir);
- return
ret
;
+ return
0
;
}
/*
}
/*