From bcf7f8fd93d5225eed2ef8df7b17ad7881835f90 Mon Sep 17 00:00:00 2001 From: Bernard Blackham Date: Fri, 8 Mar 2013 20:05:29 +0000 Subject: [PATCH] isolate: Make memsw controller optional. --- isolate/isolate.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/isolate/isolate.c b/isolate/isolate.c index 460f1b0..f27ff63 100644 --- a/isolate/isolate.c +++ b/isolate/isolate.c @@ -647,7 +647,11 @@ cg_read(cg_controller controller, const char *attr, char *buf) int n = read(fd, buf, CG_BUFSIZE); if (n < 0) - die("Cannot read %s: %m", path); + { + if (maybe) + return 0; + die("Cannot read %s: %m", path); + } if (n >= CG_BUFSIZE - 1) die("Attribute %s too long", path); if (n > 0 && buf[n-1] == '\n') @@ -773,7 +777,7 @@ cg_enter(void) if (cg_memory_limit) { cg_write(CG_MEMORY, "memory.limit_in_bytes", "%lld\n", (long long) cg_memory_limit << 10); - cg_write(CG_MEMORY, "memory.memsw.limit_in_bytes", "%lld\n", (long long) cg_memory_limit << 10); + cg_write(CG_MEMORY, "?memory.memsw.limit_in_bytes", "%lld\n", (long long) cg_memory_limit << 10); } if (cg_timing) -- 2.39.2