Skip to content

Commit

Permalink
rmdir and lxc_unpriv returns non-negative error codes
Browse files Browse the repository at this point in the history
Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
  • Loading branch information
caglar10ur authored and stgraber committed Dec 4, 2014
1 parent 06f976c commit 8479c13
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/lxc/bdev.c
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/lxc/log.c
Expand Up @@ -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;
Expand Down

0 comments on commit 8479c13

Please sign in to comment.