From 24987eb3cc175dd4e5cfaab5abe6da02b64104bc Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sat, 29 Jun 2024 15:27:02 +0200 Subject: [PATCH] mkfs-util: Set sector size for btrfs as well btrfs used to default the sector size to the page size and didn't support anything else. Since 6.7, it defaults to 4K and using 4K makes the filesystem compatible with all page sizes. So let's make sure we use minimum 4K as well (lower causes failures on systems with a 4K page size) but still allow larger sector sizes if specified by the user. (cherry picked from commit 03c9e88fb7eb8973477c33aa63dc6bcf0cab52c9) --- src/shared/mkfs-util.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c index 4d440127e57..14bf82b5643 100644 --- a/src/shared/mkfs-util.c +++ b/src/shared/mkfs-util.c @@ -461,6 +461,15 @@ 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(); + } + } else if (streq(fstype, "f2fs")) { argv = strv_new(mkfs, "-g", /* "default options" */