Blame 0040-Revert-cgroup.c-check-return-value-of-unit_realize_c.patch
|
Harald Hoyer |
fe20ad |
From c3cfb3213c9ac33679e4b9f01379e6520b769155 Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
fe20ad |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
fe20ad |
Date: Wed, 28 Aug 2013 15:42:34 +0200
|
|
Harald Hoyer |
fe20ad |
Subject: [PATCH] Revert "cgroup.c: check return value of
|
|
Harald Hoyer |
fe20ad |
unit_realize_cgroup_now()"
|
|
Harald Hoyer |
fe20ad |
|
|
Harald Hoyer |
fe20ad |
This reverts commit 092ce0fbd755a56fe2fd25a28519fe974ebf1d2f.
|
|
Harald Hoyer |
fe20ad |
---
|
|
Harald Hoyer |
fe20ad |
src/core/cgroup.c | 9 ++-------
|
|
Harald Hoyer |
fe20ad |
1 file changed, 2 insertions(+), 7 deletions(-)
|
|
Harald Hoyer |
fe20ad |
|
|
Harald Hoyer |
fe20ad |
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
|
|
Harald Hoyer |
fe20ad |
index 50b17f3..5a1c3ad 100644
|
|
Harald Hoyer |
fe20ad |
--- a/src/core/cgroup.c
|
|
Harald Hoyer |
fe20ad |
+++ b/src/core/cgroup.c
|
|
Harald Hoyer |
fe20ad |
@@ -432,13 +432,8 @@ static int unit_realize_cgroup_now(Unit *u) {
|
|
Harald Hoyer |
fe20ad |
return 0;
|
|
Harald Hoyer |
fe20ad |
|
|
Harald Hoyer |
fe20ad |
/* First, realize parents */
|
|
Harald Hoyer |
fe20ad |
- if (UNIT_ISSET(u->slice)) {
|
|
Harald Hoyer |
fe20ad |
- int r;
|
|
Harald Hoyer |
fe20ad |
-
|
|
Harald Hoyer |
fe20ad |
- r = unit_realize_cgroup_now(UNIT_DEREF(u->slice));
|
|
Harald Hoyer |
fe20ad |
- if (r < 0)
|
|
Harald Hoyer |
fe20ad |
- return r;
|
|
Harald Hoyer |
fe20ad |
- }
|
|
Harald Hoyer |
fe20ad |
+ if (UNIT_ISSET(u->slice))
|
|
Harald Hoyer |
fe20ad |
+ unit_realize_cgroup_now(UNIT_DEREF(u->slice));
|
|
Harald Hoyer |
fe20ad |
|
|
Harald Hoyer |
fe20ad |
/* And then do the real work */
|
|
Harald Hoyer |
fe20ad |
return unit_create_cgroups(u, mask);
|