[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1521047452-28565-1-git-send-email-john.garry@huawei.com>
Date: Thu, 15 Mar 2018 01:10:52 +0800
From: John Garry <john.garry@...wei.com>
To: <peterz@...radead.org>, <mingo@...hat.com>, <acme@...nel.org>,
<alexander.shishkin@...ux.intel.com>, <jolsa@...hat.com>,
<namhyung@...nel.org>, <ak@...ux.intel.com>, <wcohen@...hat.com>,
<sukadev@...ux.vnet.ibm.com>
CC: <linux-kernel@...r.kernel.org>, <linuxarm@...wei.com>,
John Garry <john.garry@...wei.com>
Subject: [PATCH] perf vendor events: fix processing for xfs
In the recently introduced support for vendor subdirectory,
the checking for directory entries under xfs (or any other fs
which does not support dirent.d_type) is missing the check
for links for current and parent directory. This can result
in a broken pmu_events.c being generated.
Fix this by adding the appropriate check in is_leaf_dir().
Cc: Sukadev Bhattiprolu <sukadev@...ux.vnet.ibm.com>
Signed-off-by: John Garry <john.garry@...wei.com>
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index 1c01844..db3a594 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -873,7 +873,10 @@ static int is_leaf_dir(const char *fpath)
return 0;
while ((dir = readdir(d)) != NULL) {
- if (dir->d_type == DT_DIR && dir->d_name[0] != '.') {
+ if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
+ continue;
+
+ if (dir->d_type == DT_DIR) {
res = 0;
break;
} else if (dir->d_type == DT_UNKNOWN) {
--
1.9.1
Powered by blists - more mailing lists