diff options
| author | Arnaldo Carvalho de Melo | 2017-01-27 14:21:01 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo | 2017-01-27 14:28:34 +0100 |
| commit | afc45cf52c93009f1f4432e50365ce294ba7a474 (patch) | |
| tree | 40f82fe1d17a2ef733b31688b806dad2c1886a20 | |
| parent | tools build: Add tools tree support for 'make -s' (diff) | |
| download | kernel-qcow2-linux-afc45cf52c93009f1f4432e50365ce294ba7a474.tar.gz kernel-qcow2-linux-afc45cf52c93009f1f4432e50365ce294ba7a474.tar.xz kernel-qcow2-linux-afc45cf52c93009f1f4432e50365ce294ba7a474.zip | |
perf config: Do not consider an error not to have any perfconfig file
While propagating the errors from perf_config(), which were being
completely ignored, everything stopped working for people without a
~/.perfconfig file, because the perf_config_set__init() was considering
an error not to have a .perfconfig file, duh, fix it by checking the
errno after the failed stat() call.
It should also not return an error when it says it is ignoring the file,
and also a empty file should not return an error either.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Taeung Song <treeze.taeung@gmail.com>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: 8beeb00f2c84 ("perf config: Use new perf_config_set__init() to initialize config set")
Link: http://lkml.kernel.org/n/tip-ygpbab3apbs6l8wr97xedwks@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
| -rw-r--r-- | tools/perf/util/config.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index 3d906dbbef74..615e8b4a693b 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -646,8 +646,13 @@ static int perf_config_set__init(struct perf_config_set *set) goto out; } - if (stat(user_config, &st) < 0) + if (stat(user_config, &st) < 0) { + if (errno == ENOENT) + ret = 0; goto out_free; + } + + ret = 0; if (st.st_uid && (st.st_uid != geteuid())) { warning("File %s not owned by current user or root, " @@ -655,11 +660,8 @@ static int perf_config_set__init(struct perf_config_set *set) goto out_free; } - if (!st.st_size) - goto out_free; - - ret = perf_config_from_file(collect_config, user_config, set); - + if (st.st_size) + ret = perf_config_from_file(collect_config, user_config, set); out_free: free(user_config); } |