Merge "Use correct language for cgroups" into main

This commit is contained in:
T.J. Mercier 2023-11-06 21:44:18 +00:00 committed by Gerrit Code Review
commit e2288909ab
1 changed files with 1 additions and 1 deletions

View File

@ -3218,7 +3218,7 @@ static MemcgVersion __memcg_version() {
if (!CgroupGetControllerPath("memory", &memcg_path)) { if (!CgroupGetControllerPath("memory", &memcg_path)) {
return MemcgVersion::kNotFound; return MemcgVersion::kNotFound;
} }
return CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, &cgroupv2_path) && return CgroupGetControllerPath(CGROUPV2_HIERARCHY_NAME, &cgroupv2_path) &&
cgroupv2_path == memcg_path cgroupv2_path == memcg_path
? MemcgVersion::kV2 ? MemcgVersion::kV2
: MemcgVersion::kV1; : MemcgVersion::kV1;