Skip to content

Commit 3f692e2

Browse files
committed
tree-wide: don't use mkdir_errno_wrapper() without reason
Simple mkdir() is fine, too, no need to use the wrapper
1 parent 3bb5eca commit 3f692e2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/nspawn/nspawn.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,7 +1887,7 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
18871887
int r;
18881888

18891889
q = prefix_roota(root, path);
1890-
r = mkdir_errno_wrapper(q, mode);
1890+
r = RET_NERRNO(mkdir(q, mode));
18911891
if (r == -EEXIST)
18921892
return 0;
18931893
if (r < 0)
@@ -2341,7 +2341,7 @@ static int setup_pts(const char *dest) {
23412341

23422342
/* Mount /dev/pts itself */
23432343
p = prefix_roota(dest, "/dev/pts");
2344-
r = mkdir_errno_wrapper(p, 0755);
2344+
r = RET_NERRNO(mkdir(p, 0755));
23452345
if (r < 0)
23462346
return log_error_errno(r, "Failed to create /dev/pts: %m");
23472347

@@ -2666,7 +2666,7 @@ static int setup_journal(const char *directory) {
26662666
/* don't create parents here — if the host doesn't have
26672667
* permanent journal set up, don't force it here */
26682668

2669-
r = mkdir_errno_wrapper(p, 0755);
2669+
r = RET_NERRNO(mkdir(p, 0755));
26702670
if (r < 0 && r != -EEXIST) {
26712671
if (try) {
26722672
log_debug_errno(r, "Failed to create %s, skipping journal setup: %m", p);

src/shared/cgroup-setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ int cg_create(const char *controller, const char *path) {
292292
if (r < 0)
293293
return r;
294294

295-
r = mkdir_errno_wrapper(fs, 0755);
295+
r = RET_NERRNO(mkdir(fs, 0755));
296296
if (r == -EEXIST)
297297
return 0;
298298
if (r < 0)

src/udev/udevd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1933,7 +1933,7 @@ int run_udevd(int argc, char *argv[]) {
19331933
if (r < 0)
19341934
return r;
19351935

1936-
r = mkdir_errno_wrapper("/run/udev", 0755);
1936+
r = RET_NERRNO(mkdir("/run/udev", 0755));
19371937
if (r < 0 && r != -EEXIST)
19381938
return log_error_errno(r, "Failed to create /run/udev: %m");
19391939

0 commit comments

Comments
 (0)