From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 1 Jul 2024 12:25:20 +0000 (+0200)
Subject: mkfs-util: Simplify logic
X-Git-Tag: v257-rc1~1004
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9fc4388ae4a92ad8ade452da8e6940ca3b80b032;p=thirdparty%2Fsystemd.git

mkfs-util: Simplify logic
---

diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c
index 14bf82b5643..76249899292 100644
--- a/src/shared/mkfs-util.c
+++ b/src/shared/mkfs-util.c
@@ -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,