]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkfs-util: Simplify logic
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 1 Jul 2024 12:25:20 +0000 (14:25 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 1 Jul 2024 16:52:57 +0000 (18:52 +0200)
src/shared/mkfs-util.c

index 14bf82b56430f1860a010b2c7153028fd70f6374..76249899292c008b7e736e96fe912d32bf5b1bd4 100644 (file)
@@ -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,