diff options
Diffstat (limited to 'tools/perf/util/cgroup.c')
-rw-r--r-- | tools/perf/util/cgroup.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tools/perf/util/cgroup.c b/tools/perf/util/cgroup.c index 96bee5c46008..dbe2f16b1a1a 100644 --- a/tools/perf/util/cgroup.c +++ b/tools/perf/util/cgroup.c | |||
@@ -3,7 +3,6 @@ | |||
3 | #include "parse-options.h" | 3 | #include "parse-options.h" |
4 | #include "evsel.h" | 4 | #include "evsel.h" |
5 | #include "cgroup.h" | 5 | #include "cgroup.h" |
6 | #include "debugfs.h" /* MAX_PATH, STR() */ | ||
7 | #include "evlist.h" | 6 | #include "evlist.h" |
8 | 7 | ||
9 | int nr_cgroups; | 8 | int nr_cgroups; |
@@ -12,7 +11,7 @@ static int | |||
12 | cgroupfs_find_mountpoint(char *buf, size_t maxlen) | 11 | cgroupfs_find_mountpoint(char *buf, size_t maxlen) |
13 | { | 12 | { |
14 | FILE *fp; | 13 | FILE *fp; |
15 | char mountpoint[MAX_PATH+1], tokens[MAX_PATH+1], type[MAX_PATH+1]; | 14 | char mountpoint[PATH_MAX + 1], tokens[PATH_MAX + 1], type[PATH_MAX + 1]; |
16 | char *token, *saved_ptr = NULL; | 15 | char *token, *saved_ptr = NULL; |
17 | int found = 0; | 16 | int found = 0; |
18 | 17 | ||
@@ -25,8 +24,8 @@ cgroupfs_find_mountpoint(char *buf, size_t maxlen) | |||
25 | * and inspect every cgroupfs mount point to find one that has | 24 | * and inspect every cgroupfs mount point to find one that has |
26 | * perf_event subsystem | 25 | * perf_event subsystem |
27 | */ | 26 | */ |
28 | while (fscanf(fp, "%*s %"STR(MAX_PATH)"s %"STR(MAX_PATH)"s %" | 27 | while (fscanf(fp, "%*s %"STR(PATH_MAX)"s %"STR(PATH_MAX)"s %" |
29 | STR(MAX_PATH)"s %*d %*d\n", | 28 | STR(PATH_MAX)"s %*d %*d\n", |
30 | mountpoint, type, tokens) == 3) { | 29 | mountpoint, type, tokens) == 3) { |
31 | 30 | ||
32 | if (!strcmp(type, "cgroup")) { | 31 | if (!strcmp(type, "cgroup")) { |
@@ -57,15 +56,15 @@ cgroupfs_find_mountpoint(char *buf, size_t maxlen) | |||
57 | 56 | ||
58 | static int open_cgroup(char *name) | 57 | static int open_cgroup(char *name) |
59 | { | 58 | { |
60 | char path[MAX_PATH+1]; | 59 | char path[PATH_MAX + 1]; |
61 | char mnt[MAX_PATH+1]; | 60 | char mnt[PATH_MAX + 1]; |
62 | int fd; | 61 | int fd; |
63 | 62 | ||
64 | 63 | ||
65 | if (cgroupfs_find_mountpoint(mnt, MAX_PATH+1)) | 64 | if (cgroupfs_find_mountpoint(mnt, PATH_MAX + 1)) |
66 | return -1; | 65 | return -1; |
67 | 66 | ||
68 | snprintf(path, MAX_PATH, "%s/%s", mnt, name); | 67 | snprintf(path, PATH_MAX, "%s/%s", mnt, name); |
69 | 68 | ||
70 | fd = open(path, O_RDONLY); | 69 | fd = open(path, O_RDONLY); |
71 | if (fd == -1) | 70 | if (fd == -1) |