diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-24 18:48:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-24 18:48:57 -0500 |
| commit | 78e4f19ebc4c128ec72d732068df5b6f8a0e122d (patch) | |
| tree | 9c53c3f264abedd041184d107600a41acfce036b /src/nspawn/nspawn-mount.c | |
| parent | 13e785f7a0d2c78fbd822b1157ef9d7ee3fef805 (diff) | |
| parent | 4bb652ac2fe25d4c85072c9f2f610319ac9981ee (diff) | |
Merge pull request #5444 from poettering/cgroups-revert-no-error
Revert "core: simplify cg_[all_]unified()" and more.
Diffstat (limited to 'src/nspawn/nspawn-mount.c')
| -rw-r--r-- | src/nspawn/nspawn-mount.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c index fca9d170d6..d276994120 100644 --- a/src/nspawn/nspawn-mount.c +++ b/src/nspawn/nspawn-mount.c @@ -991,7 +991,10 @@ static int mount_legacy_cgns_supported( return r; } - if (cg_all_unified()) + r = cg_all_unified(); + if (r < 0) + return r; + if (r > 0) goto skip_controllers; controllers = set_new(&string_hash_ops); @@ -1094,7 +1097,10 @@ static int mount_legacy_cgns_unsupported( return r; } - if (cg_all_unified()) + r = cg_all_unified(); + if (r < 0) + return r; + if (r > 0) goto skip_controllers; controllers = set_new(&string_hash_ops); |