d4ee253068
- add some upstream fixes for 207 - fixed swap activation Resolves: rhbz#1008604
24 lines
1005 B
Diff
24 lines
1005 B
Diff
From 9b69c0d07b0db38c181e35e52bcea0eb0dd21818 Mon Sep 17 00:00:00 2001
|
|
From: Gao feng <gaofeng@cn.fujitsu.com>
|
|
Date: Fri, 13 Sep 2013 11:17:06 +0800
|
|
Subject: [PATCH] cgroup: correct the log information
|
|
|
|
it should be memory.soft_limit_in_bytes.
|
|
---
|
|
src/core/cgroup.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
|
|
index 9804227..08cb64b 100644
|
|
--- a/src/core/cgroup.c
|
|
+++ b/src/core/cgroup.c
|
|
@@ -266,7 +266,7 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha
|
|
sprintf(buf, "%" PRIu64 "\n", c->memory_soft_limit);
|
|
r = cg_set_attribute("memory", path, "memory.soft_limit_in_bytes", buf);
|
|
if (r < 0)
|
|
- log_error("Failed to set memory.limit_in_bytes on %s: %s", path, strerror(-r));
|
|
+ log_error("Failed to set memory.soft_limit_in_bytes on %s: %s", path, strerror(-r));
|
|
}
|
|
|
|
if (mask & CGROUP_DEVICE) {
|