summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/nspawn/nspawn.c6
-rw-r--r--src/shared/cgroup-setup.c2
-rw-r--r--src/udev/udevd.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 8098d37962..e23d042b57 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1887,7 +1887,7 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
int r;
q = prefix_roota(root, path);
- r = mkdir_errno_wrapper(q, mode);
+ r = RET_NERRNO(mkdir(q, mode));
if (r == -EEXIST)
return 0;
if (r < 0)
@@ -2341,7 +2341,7 @@ static int setup_pts(const char *dest) {
/* Mount /dev/pts itself */
p = prefix_roota(dest, "/dev/pts");
- r = mkdir_errno_wrapper(p, 0755);
+ r = RET_NERRNO(mkdir(p, 0755));
if (r < 0)
return log_error_errno(r, "Failed to create /dev/pts: %m");
@@ -2666,7 +2666,7 @@ static int setup_journal(const char *directory) {
/* don't create parents here — if the host doesn't have
* permanent journal set up, don't force it here */
- r = mkdir_errno_wrapper(p, 0755);
+ r = RET_NERRNO(mkdir(p, 0755));
if (r < 0 && r != -EEXIST) {
if (try) {
log_debug_errno(r, "Failed to create %s, skipping journal setup: %m", p);
diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
index 2221fd07c2..8bda66ca36 100644
--- a/src/shared/cgroup-setup.c
+++ b/src/shared/cgroup-setup.c
@@ -292,7 +292,7 @@ int cg_create(const char *controller, const char *path) {
if (r < 0)
return r;
- r = mkdir_errno_wrapper(fs, 0755);
+ r = RET_NERRNO(mkdir(fs, 0755));
if (r == -EEXIST)
return 0;
if (r < 0)
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index beec6e62e7..d37652db67 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1933,7 +1933,7 @@ int run_udevd(int argc, char *argv[]) {
if (r < 0)
return r;
- r = mkdir_errno_wrapper("/run/udev", 0755);
+ r = RET_NERRNO(mkdir("/run/udev", 0755));
if (r < 0 && r != -EEXIST)
return log_error_errno(r, "Failed to create /run/udev: %m");