From: Sami Kerola Date: Sat, 1 Aug 2015 18:01:00 +0000 (+0100) Subject: mkfs.minix: re-fix block count maths X-Git-Tag: v2.27-rc2~63 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e56e36291830f74ba5646829b4d869b565e831b;p=thirdparty%2Futil-linux.git mkfs.minix: re-fix block count maths Error, that Joshua Hudson already pointed out, creapped back to commit da41ff5 when changes were applied from mailbox rather than git remote, as the corrected change had included some accidental rubbish. Reference: http://www.spinics.net/lists/util-linux-ng/msg11764.html Reference: http://www.spinics.net/lists/util-linux-ng/msg11848.html Signed-off-by: Sami Kerola --- diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c index 16305b23fc..2da0e68787 100644 --- a/disk-utils/mkfs.minix.c +++ b/disk-utils/mkfs.minix.c @@ -706,8 +706,8 @@ static void determine_device_blocks(struct fs_control *ctl, const struct stat *s errx(MKFS_EX_ERROR, _("%s: number of blocks too small"), ctl->device_name); if (fs_version == 1 && ctl->fs_blocks > MINIX_MAX_INODES) ctl->fs_blocks = MINIX_MAX_INODES; - if (ctl->fs_blocks > MINIX_MAX_INODES * BITS_PER_BLOCK) - ctl->fs_blocks = MINIX_MAX_INODES * BITS_PER_BLOCK; /* Utter maximum: Clip. */ + if (ctl->fs_blocks > (4 + ((MINIX_MAX_INODES - 4) * BITS_PER_BLOCK))) + ctl->fs_blocks = 4 + ((MINIX_MAX_INODES - 4) * BITS_PER_BLOCK); /* Utter maximum: Clip. */ } static void check_user_instructions(struct fs_control *ctl)