Fix bug where mke2fs was incorrectly checking
the argument to the -g option, if the default block size
is used. (Addresses Debian bug #188319)
diff --git a/debian/changelog b/debian/changelog
index 60699ed..c856651 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@
* Add libblkid1-udeb package for the Debian Installer.
* Use the SS_READLINE_PATH environment variable to control the search
for a suitable readine library.
+ * Fix bug in mke2fs, which was was incorrectly checking the argument
+ to the -g option if the default block size is used. (Closes: #188319)
- -- Theodore Y. Ts'o <tytso@mit.edu> Fri, 11 Apr 2003 12:55:34 -0400
+ -- Theodore Y. Ts'o <tytso@mit.edu> Fri, 11 Apr 2003 13:45:18 -0400
e2fsprogs (1.32+1.33-WIP-2003.03.30-2) unstable; urgency=low
diff --git a/misc/ChangeLog b/misc/ChangeLog
index 6f808e2..38372d4 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,5 +1,9 @@
2003-04-11 Theodore Ts'o <tytso@mit.edu>
+ * mke2fs.c (PRS): Fix bug where mke2fs was incorrectly checking
+ the argument to the -g option, if the default block size
+ is used. (Addresses Debian bug #188319)
+
* tune2fs.8.in, mke2fs.8.in: Document the dir_index filesystem
feature which can be used with the -O option.
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(¶m)) {
com_err(program_name, 0,
_("blocks per group count out of range"));
exit(1);