mke2fs.c (set_fs_defaults): Fix bug which caused -T largefile or

	-T largefile4 to core dump due to a division by zero
	error.  (Addressed Debian bug #207082)

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 52f7cb6bf150437d7804edafa9639fe553144a79..f93d88718ab4a053aac4a809c89e1f0fe4c35e95 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-31  Theodore Ts'o  <tytso@mit.edu>
+
+       * mke2fs.c (set_fs_defaults): Fix bug which caused -T largefile or
+               -T largefile4 to core dump due to a division by zero
+               error.  (Addressed Debian bug #207082)
+
 2003-08-24  Theodore Ts'o  <tytso@mit.edu>
 
        * dumpe2fs.8.in, e2image.8.in, e2label.8.in, mke2fs.8.in,

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 1c98c50a6e259c34c761ab6e6b48c28fcdbe1654..a2c8553b1a480776df3757ef5efc94e5b448f3d5 100644 (file)
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -171,11 +171,11 @@ static void set_fs_defaults(const char *fs_type,
                                blocksize : p->inode_ratio;
                use_bsize = p->blocksize;
        }
-       if (sector_size && use_bsize < sector_size)
-               use_bsize = sector_size;
        if (blocksize <= 0) {
                if (use_bsize == DEF_MAX_BLOCKSIZE)
                        use_bsize = sys_page_size;
+               if (sector_size && use_bsize < sector_size)
+                       use_bsize = sector_size;
                if ((blocksize < 0) && (use_bsize < (-blocksize)))
                        use_bsize = -blocksize;
                blocksize = use_bsize;