From 44cdeb6e33d8d2c9f32e1c46ce402d5311ae6a0b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 8 Nov 2021 12:12:58 +0100 Subject: [PATCH] makefs: reindent mkfs calls to follow the same style I think this also makes it much easier to see what args are passed. --- src/shared/mkfs-util.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c index 924afdfd930..b9c2f147bc1 100644 --- a/src/shared/mkfs-util.c +++ b/src/shared/mkfs-util.c @@ -75,23 +75,29 @@ int make_filesystem( "-I", "256", "-O", "has_journal", "-m", "0", - "-E", discard ? "lazy_itable_init=1,discard" : "lazy_itable_init=1,nodiscard", + "-E", discard ? "discard,lazy_itable_init=1" : "nodiscard,lazy_itable_init=1", node, NULL); else if (streq(fstype, "btrfs")) { - if (discard) - (void) execlp(mkfs, mkfs, "-L", label, "-U", ID128_TO_UUID_STRING(uuid), node, NULL); - else - (void) execlp(mkfs, mkfs, "-L", label, "-U", ID128_TO_UUID_STRING(uuid), "--nodiscard", node, NULL); + (void) execlp(mkfs, mkfs, + "-L", label, + "-U", ID128_TO_UUID_STRING(uuid), + node, + discard ? NULL : "--nodiscard", + NULL); } else if (streq(fstype, "xfs")) { const char *j; j = strjoina("uuid=", ID128_TO_UUID_STRING(uuid)); - if (discard) - (void) execlp(mkfs, mkfs, "-L", label, "-m", j, "-m", "reflink=1", node, NULL); - else - (void) execlp(mkfs, mkfs, "-L", label, "-m", j, "-m", "reflink=1", "-K", node, NULL); + + (void) execlp(mkfs, mkfs, + "-L", label, + "-m", j, + "-m", "reflink=1", + node, + discard ? NULL : "-K", + NULL); } else if (streq(fstype, "vfat")) { char mangled_label[8 + 3 + 1], vol_id[8 + 1]; -- 2.47.3