From: Maurizio Lombardi <m.lombardi85@gmail.com>
Date: Mon, 21 Nov 2011 19:30:40 +0000 (+0100)
Subject: mkfs.minix: The total number of zones is limited to 65536 only on V1 filesystems
X-Git-Tag: v2.21-rc1~157^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57ba4027a591becd0264e8672b2ce2efd45bf5b3;p=thirdparty%2Futil-linux.git

mkfs.minix: The total number of zones is limited to 65536 only on V1 filesystems
---

diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 259d0bc4cb..9c926106f4 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -788,13 +788,12 @@ int main(int argc, char ** argv) {
 
 	if (fs_version == 3)
 		magic = MINIX3_SUPER_MAGIC;
-
-	if (fs_version == 2) {
+	else if (fs_version == 2) {
 		if (namelen == 14)
 			magic = MINIX2_SUPER_MAGIC;
 		else
 			magic = MINIX2_SUPER_MAGIC2;
-	} else
+	} else /* fs_version == 1 */
 		if (BLOCKS > MINIX_MAX_INODES)
 			BLOCKS = MINIX_MAX_INODES;
 	setup_tables();