commit 787ddbc8a57b34d8d74dfd19b47ab5c816ae2af3
author T.J. Mercier <tjmercier@google.com> Tue Oct 08 23:41:34 2024 +0000
committer T.J. Mercier <tjmercier@google.com> Tue Oct 08 23:42:55 2024 +0000
tree 60b4fa4598646e0b8a1cb74434801b76c432a5e4
parent 47580ff76d9d9ecbaa9345a9aa02e95bd6bbce33

Reapply "libprocessgroup: Combine all 3 ActivateControllers imple..."

This reverts commit 0fa49253a484fc0c99d067ade57a4978059b3a95.

Change-Id: I83121ff295caaabc0a2fd8a606ee2d52dacb0174

libprocessgroup/processgroup.cpp

diff --git a/libprocessgroup/processgroup.cpp b/libprocessgroup/processgroup.cpp
index 83a2258..d3719ee 100644
--- a/libprocessgroup/processgroup.cpp
+++ b/libprocessgroup/processgroup.cpp
@@ -662,10 +662,9 @@
         return -errno;
     }
     if (activate_controllers) {
-        ret = CgroupMap::GetInstance().ActivateControllers(uid_path);
-        if (ret) {
-            LOG(ERROR) << "Failed to activate controllers in " << uid_path;
-            return ret;
+        if (!CgroupMap::GetInstance().ActivateControllers(uid_path)) {
+            PLOG(ERROR) << "Failed to activate controllers in " << uid_path;
+            return -errno;
         }
     }