From: Ben Gras <ben@minix3.org>
Date: Tue, 28 Jun 2005 11:58:17 +0000 (+0000)
Subject: Removed max-inode check from mkfs because of 32-bit inode numbers in V3
X-Git-Tag: v3.1.0~689
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/man.dnssec-keyfromlabel.html?a=commitdiff_plain;h=850d6611eb0eabc2f9091e3bbd2e48ec4a653b94;p=minix.git

Removed max-inode check from mkfs because of 32-bit inode numbers in V3
FS. Tested by mkfs -i 200000, fsck, file system creating with 200000
inodes, fsck again.
---

diff --git a/commands/simple/Makefile b/commands/simple/Makefile
index f696d0c9e..25e87f5b2 100755
--- a/commands/simple/Makefile
+++ b/commands/simple/Makefile
@@ -469,7 +469,7 @@ life:	life.c
 
 login:	login.c
 	$(CCLD) -o $@ $?
-	@install -S 4kw $@
+	install -S 4kw $@
 
 look:	look.c
 	$(CCLD) -o $@ $?
diff --git a/commands/simple/mkfs.c b/commands/simple/mkfs.c
index 705deda6d..a9bd9cbaf 100755
--- a/commands/simple/mkfs.c
+++ b/commands/simple/mkfs.c
@@ -301,13 +301,13 @@ char *argv[];
 		/* round up to fill inode block */
 		i += inodes_per_block - 1;
 		i = i / inodes_per_block * inodes_per_block;
-		if (i > INODE_MAX) i = INODE_MAX;
+		if (i > INODE_MAX && fs_version < 3) i = INODE_MAX;
 
 	}
 	if (blocks < 5) pexit("Block count too small");
 	if (blocks > max_nrblocks) pexit("Block count too large");
 	if (i < 1) pexit("Inode count too small");
-	if (i > INODE_MAX) pexit("Inode count too large");
+	if (i > INODE_MAX && fs_version < 3) pexit("Inode count too large");
 	inodes = (ino_t) i;
 
 	/* Make simple file system of the given size, using defaults. */