From 71521317b2a4432fb5aa1878a7933d563b7020cb Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Graber?= Date: Fri, 15 Feb 2019 20:02:07 -0500 Subject: [PATCH] mount: Cleanup allow over-mounting MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- src/lxc/lxccontainer.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c index 667674ba0..683bf5f43 100644 --- a/src/lxc/lxccontainer.c +++ b/src/lxc/lxccontainer.c @@ -4970,7 +4970,10 @@ static int create_mount_target(const char *dest, mode_t st_mode) ret = mkdir(dest, 0000); else ret = mknod(dest, S_IFREG | 0000, 0); - if (ret < 0) { + + if (ret == 0) + TRACE("Created mount target \"%s\"", dest); + else if (ret < 0 && ret != EEXIST) { SYSERROR("Failed to create mount target \"%s\"", dest); return -1; } @@ -5071,12 +5074,9 @@ static int do_lxcapi_mount(struct lxc_container *c, const char *source, _exit(EXIT_FAILURE); } - if (access(target, F_OK) < 0 && errno == ENOENT) { - ret = create_mount_target(target, sb.st_mode); - if (ret < 0) - _exit(EXIT_FAILURE); - TRACE("Created mount target \"%s\"", target); - } + ret = create_mount_target(target, sb.st_mode); + if (ret < 0) + _exit(EXIT_FAILURE); suff = strrchr(template, '/'); if (!suff) -- 2.47.2