treewide: use create_dir_all directly

create_dir_all doesn't fail if the folder already exists.

Signed-off-by: Stefan Kerkmann <s.kerkmann@pengutronix.de>

Author: KarlK90

src/main.rs

@@ -5,7 +5,7 @@ use std::env;
 use std::env::current_exe;
 use std::ffi::CString;
 use std::fmt::Write as _;
-use std::fs::{create_dir, read_to_string, File, OpenOptions};
+use std::fs::{read_to_string, File, OpenOptions};
 use std::io;
 use std::io::Write as _;
 use std::os::fd::{AsFd, AsRawFd, RawFd};
@@ -37,15 +37,6 @@ mod usbg_9pfs;
 
 type Result<T> = std::result::Result<T, Box<dyn std::error::Error>>;
 
-pub fn mkdir(dir: &str) -> Result<()> {
-    if let Err(e) = create_dir(dir) {
-        if e.kind() != io::ErrorKind::AlreadyExists {
-            return Err(format!("Failed to create {dir}: {e}",).into());
-        }
-    }
-    Ok(())
-}
-
 /*
  * Setup stdout/stderr. The kernel will create /dev/console in the
  * initramfs, so we can use that.

src/mount.rs

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
-use std::fs::remove_dir;
+use std::fs::{create_dir_all, remove_dir};
 use std::path::Path;
 
 use log::debug;
 use nix::mount::{mount, MsFlags};
 
 use crate::cmdline::CmdlineOptions;
-use crate::{mkdir, Result};
+use crate::Result;
 
 pub fn do_mount(
     src: Option<&str>,
@@ -16,7 +16,7 @@ pub fn do_mount(
     flags: MsFlags,
     data: Option<&str>,
 ) -> Result<()> {
-    mkdir(dst)?;
+    create_dir_all(dst)?;
 
     mount(src, dst, fstype, flags, data).map_err(|e| {
         format!(
@@ -49,7 +49,7 @@ pub fn mount_root(options: &CmdlineOptions) -> Result<()> {
         return Err("root= not found in /proc/cmdline".into());
     }
 
-    mkdir("/root")?;
+    create_dir_all("/root")?;
 
     debug!(
         "Mounting rootfs {} -> /root as {} with flags = {:#x}, data = '{}'",

src/systemd.rs

@@ -2,15 +2,15 @@
 
 use std::collections::BinaryHeap;
 use std::env;
-use std::fs::read_to_string;
+use std::fs::{create_dir_all, read_to_string};
 use std::path::Path;
 
 use nix::mount::{umount, MsFlags};
 use nix::sys::reboot::{reboot, RebootMode};
 
 use crate::cmdline::CmdlineOptions;
 use crate::mount::do_mount;
-use crate::{mkdir, Result};
+use crate::Result;
 
 pub fn mount_systemd(options: &mut CmdlineOptions) -> Result<()> {
     do_mount(
@@ -30,8 +30,8 @@ pub fn mount_systemd(options: &mut CmdlineOptions) -> Result<()> {
     options.cleanup = false;
 
     /* expected by systemd when going back to the initramfs during shutdown */
-    mkdir("/run")?;
-    mkdir("/oldroot")?;
+    create_dir_all("/run")?;
+    create_dir_all("/oldroot")?;
 
     do_mount(
         Some("/"),

src/usbg_9pfs.rs

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
-use std::fs::{read_dir, write};
+use std::fs::{create_dir_all, read_dir, write};
 use std::os::unix::ffi::OsStrExt;
 use std::os::unix::fs::symlink;
 use std::{thread, time};
@@ -9,7 +9,7 @@ use log::debug;
 
 use crate::cmdline::CmdlineOptions;
 use crate::mount::mount_apivfs;
-use crate::{mkdir, Result};
+use crate::Result;
 
 fn write_file<C: AsRef<[u8]>>(path: &str, content: C) -> Result<()> {
     write(path, content).map_err(|e| format!("Failed to write to {path}: {e}").into())
@@ -27,12 +27,12 @@ fn setup_9pfs_gadget(device: &String) -> Result<()> {
 
     mount_apivfs("/sys/kernel/config", "configfs")?;
 
-    mkdir("/sys/kernel/config/usb_gadget/9pfs")?;
+    create_dir_all("/sys/kernel/config/usb_gadget/9pfs")?;
 
     write_file("/sys/kernel/config/usb_gadget/9pfs/idVendor", "0x1d6b")?;
     write_file("/sys/kernel/config/usb_gadget/9pfs/idProduct", "0x0109")?;
 
-    mkdir("/sys/kernel/config/usb_gadget/9pfs/strings/0x409")?;
+    create_dir_all("/sys/kernel/config/usb_gadget/9pfs/strings/0x409")?;
     write_file(
         "/sys/kernel/config/usb_gadget/9pfs/strings/0x409/serialnumber",
         "01234567",
@@ -46,12 +46,12 @@ fn setup_9pfs_gadget(device: &String) -> Result<()> {
         "9PFS Gadget",
     )?;
 
-    mkdir("/sys/kernel/config/usb_gadget/9pfs/configs/c.1")?;
-    mkdir("/sys/kernel/config/usb_gadget/9pfs/configs/c.1/strings/0x409")?;
+    create_dir_all("/sys/kernel/config/usb_gadget/9pfs/configs/c.1")?;
+    create_dir_all("/sys/kernel/config/usb_gadget/9pfs/configs/c.1/strings/0x409")?;
 
     let function = format!("/sys/kernel/config/usb_gadget/9pfs/functions/usb9pfs.{device}");
     let link = format!("/sys/kernel/config/usb_gadget/9pfs/configs/c.1/usb9pfs.{device}");
-    mkdir(&function)?;
+    create_dir_all(&function)?;
     symlink(&function, &link)?;
 
     debug!(