Skip to contentSkip to conversation

mkfs.minix -3 creates incorrect and limited filesystem

PATCH Vladimir 'φ-coder/phcoder' Serbinenko 2 participants 3 messages May 2, 2012 – May 3, 2012 Util-Linux package

lore
Share & tools
lore

Vladimir 'φ-coder/phcoder' Serbinenko

author
#0 lore raw
disk-utils/mkfs.minix.c +2 -2
@@ -487,7 +487,7 @@ static void setup_tables(void) {
 
 	if (fs_version == 3) {
 		Super3.s_log_zone_size = 0;
-		Super3.s_blocksize = BLOCKS;
+		Super3.s_blocksize = MINIX_BLOCK_SIZE;
 	}
 	else {
 		Super.s_log_zone_size = 0;

@@ -773,7 +773,7 @@ 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
Signature · 2 lines
Regards
Vladimir 'φ-coder/phcoder' Serbinenko
#1 lore raw
Quoted 13 lines · Vladimir 'φ-coder/phcoder' Serbinenko
disk-utils/mkfs.minix.c +1 -1
@@ -487,7 +487,7 @@ static void setup_tables(void) {
 
 	if (fs_version == 3) {
 		Super3.s_log_zone_size = 0;
-		Super3.s_blocksize = BLOCKS;
+		Super3.s_blocksize = MINIX_BLOCK_SIZE;
 	}
 	else {
 		Super.s_log_zone_size = 0;

disk-utils/mkfs.minix.c int main(int argc, char ** argv) { · line 779

Quoted 8 lines
disk-utils/mkfs.minix.c +1 -1
@@ -773,7 +773,7 @@ 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

Correct, however this is already fixed in new versions.

Thanks,
Davidlohr

author
#2 lore raw
Quoted 17 lines · Davidlohr Bueso
Quoted 15 lines · Vladimir 'φ-coder/phcoder' Serbinenko
disk-utils/mkfs.minix.c +1 -1
@@ -487,7 +487,7 @@ static void setup_tables(void) {
 
 	if (fs_version == 3) {
 		Super3.s_log_zone_size = 0;
-		Super3.s_blocksize = BLOCKS;
+		Super3.s_blocksize = MINIX_BLOCK_SIZE;
 	}
 	else {
 		Super.s_log_zone_size = 0;

@@ -773,7 +773,7 @@ int main(int argc, char ** argv) {
 	if (fs_version == 3)
 		magic = MINIX3_SUPER_MAGIC;
Quoted 7 lines

disk-utils/mkfs.minix.c int main(int argc, char ** argv) { · line 779

Quoted 6 lines
disk-utils/mkfs.minix.c +1 -1
-	if (fs_version == 2) {
+	else if (fs_version == 2) {
 		if (namelen == 14)
 			magic = MINIX2_SUPER_MAGIC;
 		else

Correct, however this is already fixed in new versions.

Ok, sorry for noise then, I've used Debian version. I've discovered this and few other Linux and tools bugs when writing automatic tests for GRUB fs drivers.

Quoted 5 lines

Thanks,
Davidlohr

Signature · 2 lines
Regards
Vladimir 'φ-coder/phcoder' Serbinenko