Add mkdir_errno_wrapper() and use instead of mkdir() in various places

We'd pass pointers to mkdir and mkdir_label to call in various places. mkdir
returns the error in errno while mkdir_label returns the error directly.

1 files changed, 1 insertions, 23 deletions

diff --git a/src/basic/label.c b/src/basic/label.c
index 8a2d87818..19d2bca10 100644
--- a/src/basic/label.c
+++ b/src/basic/label.c
@@ -22,7 +22,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-//#include "btrfs-util.h"
 #include "label.h"
 #include "macro.h"
 #include "selinux-util.h"
@@ -51,11 +50,8 @@ int mkdir_label(const char *path, mode_t mode) {
         if (r < 0)
                 return r;
 
-        if (mkdir(path, mode) < 0)
-                r = -errno;
-
+        r = mkdir_errno_wrapper(path, mode);
         mac_selinux_create_file_clear();
-
         if (r < 0)
                 return r;
 
@@ -84,21 +80,3 @@ int symlink_label(const char *old_path, const char *new_path) {
         return mac_smack_fix(new_path, false, false);
 }
 #endif // 0
-
-int btrfs_subvol_make_label(const char *path) {
-        int r;
-
-        assert(path);
-
-        r = mac_selinux_create_file_prepare(path, S_IFDIR);
-        if (r < 0)
-                return r;
-
-        r = btrfs_subvol_make(path);
-        mac_selinux_create_file_clear();
-
-        if (r < 0)
-                return r;
-
-        return mac_smack_fix(path, false, false);
-}