Merge "libprocessgroup: Don't sleep after last cgroup removal attempt…

…" into main am: af5de39 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2777582 Change-Id: I40e30875dd7b802d4e17fb28ab70f1b247fdd896 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
GrapheneOS · Oct 7, 2023 · 5a374dc · 5a374dc
2 parents b9a6391 + af5de39
commit 5a374dc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libprocessgroup/processgroup.cpp b/libprocessgroup/processgroup.cpp
@@ -219,7 +219,7 @@ static int RemoveProcessGroup(const char* cgroup, uid_t uid, int pid, unsigned i
 
     while (retries--) {
         ret = rmdir(uid_pid_path.c_str());
-        if (!ret || errno != EBUSY) break;
+        if (!ret || errno != EBUSY || !retries) break;
         std::this_thread::sleep_for(5ms);
     }