.. | .. |
---|
120 | 120 | int err = 0; |
---|
121 | 121 | int map_fd; |
---|
122 | 122 | |
---|
123 | | - expected_ids[0] = 0x100000001; /* root cgroup */ |
---|
| 123 | + expected_ids[0] = get_cgroup_id("/.."); /* root cgroup */ |
---|
124 | 124 | expected_ids[1] = get_cgroup_id(""); |
---|
125 | 125 | expected_ids[2] = get_cgroup_id(CGROUP_PATH); |
---|
126 | 126 | expected_ids[3] = 0; /* non-existent cgroup */ |
---|
.. | .. |
---|
160 | 160 | exit(EXIT_FAILURE); |
---|
161 | 161 | } |
---|
162 | 162 | |
---|
163 | | - if (setup_cgroup_environment()) |
---|
164 | | - goto err; |
---|
165 | | - |
---|
166 | | - cgfd = create_and_get_cgroup(CGROUP_PATH); |
---|
167 | | - if (!cgfd) |
---|
168 | | - goto err; |
---|
169 | | - |
---|
170 | | - if (join_cgroup(CGROUP_PATH)) |
---|
| 163 | + cgfd = cgroup_setup_and_join(CGROUP_PATH); |
---|
| 164 | + if (cgfd < 0) |
---|
171 | 165 | goto err; |
---|
172 | 166 | |
---|
173 | 167 | if (send_packet(argv[1])) |
---|