mkfs-util: Simplify logic

2024-07-01 18:52:57 +02:00
parent 29294d21cf
commit 9fc4388ae4
1 changed files with 3 additions and 8 deletions
@@ -461,14 +461,9 @@ int make_filesystem(
                if (quiet)
                        stdio_fds[1] = -EBADF;

-                if (sector_size > 0) {
-                        if (strv_extend(&argv, "--sectorsize") < 0)
-                                return log_oom();
-
-                        /* mkfs.btrfs expects a sector size of at least 4k bytes. */
-                        if (strv_extendf(&argv, "%"PRIu64, MAX(sector_size, 4 * U64_KB)) < 0)
-                                return log_oom();
-                }
+                /* mkfs.btrfs expects a sector size of at least 4k bytes. */
+                if (sector_size > 0 && strv_extendf(&argv, "--sectorsize=%"PRIu64, MAX(sector_size, 4 * U64_KB)) < 0)
+                        return log_oom();

        } else if (streq(fstype, "f2fs")) {
                argv = strv_new(mkfs,