commit 5e804b72b66c04eb597fc9f6a45226eb8e71eccd
author Theodore Ts'o <tytso@mit.edu> Fri Apr 11 13:46:57 2003 -0400
committer Theodore Ts'o <tytso@mit.edu> Fri Apr 11 13:46:57 2003 -0400
tree 297c5978897a0b2b93243a9aaeb0ef43aa45256b
parent ccbed85afe9138cac486caf8adcdae80212b8c42

Fix bug where mke2fs was incorrectly checking
the argument to the -g option, if the default block size
is used.  (Addresses Debian bug #188319)

misc/mke2fs.c

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index d03d80a..f0183ed 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -791,7 +791,6 @@
 	int		c;
 	int		size;
 	char *		tmp;
-	blk_t		group_blk_max = 8192;
 	int		blocksize = 0;
 	int		inode_ratio = 0;
 	int		inode_size = 0;
@@ -889,7 +888,6 @@
 					blocksize);
 			param.s_log_block_size =
 				int_log2(blocksize >> EXT2_MIN_BLOCK_LOG_SIZE);
-			group_blk_max = blocksize * 8;
 			break;
 		case 'c':	/* Check for bad blocks */
 		case 't':	/* deprecated */
@@ -1177,7 +1175,7 @@
 
 	if (param.s_blocks_per_group) {
 		if (param.s_blocks_per_group < 256 ||
-		    param.s_blocks_per_group > group_blk_max) {
+		    param.s_blocks_per_group > 8 * EXT2_BLOCK_SIZE(&param)) {
 			com_err(program_name, 0,
 				_("blocks per group count out of range"));
 			exit(1);