From: Arnaldo Carvalho de Melo Date: Fri, 27 Jan 2017 13:21:01 +0000 (-0300) Subject: perf config: Do not consider an error not to have any perfconfig file X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=afc45cf52c93009f1f4432e50365ce294ba7a474;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Taeung Song Cc: Wang Nan 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 --- 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); }