From e7f40d8aaba2c17b8ccb323b5df20a423ef5d0a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
Date: Wed, 29 Aug 2012 14:42:59 -0700
Subject: [PATCH] When creating the lxc cgroup directory, ignore -EEXIST
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com
---
 src/lxc/cgroup.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/lxc/cgroup.c b/src/lxc/cgroup.c
index 15f021239..69ba4e5d1 100644
--- a/src/lxc/cgroup.c
+++ b/src/lxc/cgroup.c
@@ -419,9 +419,12 @@ static int lxc_one_cgroup_create(const char *name,
 	}
 
 	/* if cgparent does not exist, create it */
-	if (access(cgparent, F_OK) && mkdir(cgparent, 0755)) {
-		SYSERROR("failed to create '%s' directory", cgparent);
-		return -1;
+	if (access(cgparent, F_OK)) {
+		ret = mkdir(cgparent, 0755);
+		if (ret == -1 && errno == EEXIST) {
+			SYSERROR("failed to create '%s' directory", cgparent);
+			return -1;
+		}
 	}
 
 	/*