From 8479c136351f7e369db410368fca784c40e4e4c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 4 Dec 2014 12:59:47 -0500 Subject: [PATCH] rmdir and lxc_unpriv returns non-negative error codes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: S.Çağlar Onur Acked-by: Stéphane Graber --- src/lxc/bdev.c | 4 ++-- src/lxc/log.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c index 75e689681..822d62c90 100644 --- a/src/lxc/bdev.c +++ b/src/lxc/bdev.c @@ -1419,7 +1419,7 @@ static int btrfs_snapshot(const char *orig, const char *new) goto out; } // make sure the directory doesn't already exist - if (rmdir(newfull) < 0 && errno != -ENOENT) { + if (rmdir(newfull) < 0 && errno != ENOENT) { SYSERROR("Error removing empty new rootfs"); goto out; } @@ -1512,7 +1512,7 @@ static int btrfs_clonepaths(struct bdev *orig, struct bdev *new, const char *old return userns_exec_1(conf, btrfs_snapshot_wrapper, &sdata); } - if (rmdir(new->dest) < 0 && errno != -ENOENT) { + if (rmdir(new->dest) < 0 && errno != ENOENT) { SYSERROR("removing %s", new->dest); return -1; } diff --git a/src/lxc/log.c b/src/lxc/log.c index 0fe376ca7..ff680a9f8 100644 --- a/src/lxc/log.c +++ b/src/lxc/log.c @@ -159,7 +159,7 @@ static int build_dir(const char *name) *p = '\0'; if (access(n, F_OK)) { ret = lxc_unpriv(mkdir(n, 0755)); - if (ret && errno != -EEXIST) { + if (ret && errno != EEXIST) { SYSERROR("failed to create directory '%s'.", n); free(n); return -1; -- 2.47.2