|
 |
b8c242 |
From 2aaa40e698f66fd10d0a7a71ca39637e24809e97 Mon Sep 17 00:00:00 2001
|
|
|
b8c242 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
b8c242 |
Date: Wed, 17 Oct 2018 17:48:35 +0200
|
|
|
b8c242 |
Subject: [PATCH] core: return true from cg_is_empty* on ENOENT
|
|
|
b8c242 |
|
|
|
b8c242 |
(cherry picked from commit 1bcf3fc6c57d92927b96cad8c739099b4ceae236)
|
|
|
b8c242 |
|
|
|
b8c242 |
Related: #1860899
|
|
|
b8c242 |
---
|
|
|
b8c242 |
src/basic/cgroup-util.c | 6 ++++--
|
|
|
b8c242 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
b8c242 |
|
|
|
b8c242 |
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
|
|
|
b8c242 |
index 992b12811a..14abe6e014 100644
|
|
|
b8c242 |
--- a/src/basic/cgroup-util.c
|
|
|
b8c242 |
+++ b/src/basic/cgroup-util.c
|
|
|
b8c242 |
@@ -1177,7 +1177,7 @@ int cg_is_empty(const char *controller, const char *path) {
|
|
|
b8c242 |
|
|
|
b8c242 |
r = cg_enumerate_processes(controller, path, &f);
|
|
|
b8c242 |
if (r == -ENOENT)
|
|
|
b8c242 |
- return 1;
|
|
|
b8c242 |
+ return true;
|
|
|
b8c242 |
if (r < 0)
|
|
|
b8c242 |
return r;
|
|
|
b8c242 |
|
|
|
b8c242 |
@@ -1207,6 +1207,8 @@ int cg_is_empty_recursive(const char *controller, const char *path) {
|
|
|
b8c242 |
* via the "populated" attribute of "cgroup.events". */
|
|
|
b8c242 |
|
|
|
b8c242 |
r = cg_read_event(controller, path, "populated", &t);
|
|
|
b8c242 |
+ if (r == -ENOENT)
|
|
|
b8c242 |
+ return true;
|
|
|
b8c242 |
if (r < 0)
|
|
|
b8c242 |
return r;
|
|
|
b8c242 |
|
|
|
b8c242 |
@@ -1221,7 +1223,7 @@ int cg_is_empty_recursive(const char *controller, const char *path) {
|
|
|
b8c242 |
|
|
|
b8c242 |
r = cg_enumerate_subgroups(controller, path, &d);
|
|
|
b8c242 |
if (r == -ENOENT)
|
|
|
b8c242 |
- return 1;
|
|
|
b8c242 |
+ return true;
|
|
|
b8c242 |
if (r < 0)
|
|
|
b8c242 |
return r;
|
|
|
b8c242 |
|