ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mkfs.minix: remove unuseful code 

Checks about inodes vs block sizes does not add much robustness.  Both
values are derived at compilation time from struct minix_inode size, and
they form full definition circle.

Bad block check for none-block devices should not be supressed, user
requested it so let him have it.

Check for st_rdev == 0x0300 || st_rdev == 0x0340 was unreachable.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2015-06-24 09:15:11 +01:00 committed by Karel Zak
parent c99128bcf5
commit 3bb74a3ada
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
disk-utils/mkfs.minix.c
View File

@ -659,11 +659,6 @@ int main(int argc, char ** argv) {
textdomain(PACKAGE);
atexit(close_stdout);
if (INODE_SIZE * MINIX_INODES_PER_BLOCK != MINIX_BLOCK_SIZE)
errx(MKFS_EX_ERROR, _("%s: bad inode size"), device_name);
if (INODE2_SIZE * MINIX2_INODES_PER_BLOCK != MINIX_BLOCK_SIZE)
errx(MKFS_EX_ERROR, _("%s: bad inode size"), device_name);
while ((i = getopt_long(argc, argv, "1v23n:i:cl:Vh", longopts, NULL)) != -1)
switch (i) {
case '1':
@ -776,9 +771,7 @@ int main(int argc, char ** argv) {
} else if (!S_ISBLK(statbuf.st_mode)) {
if (!BLOCKS)
BLOCKS = statbuf.st_size / MINIX_BLOCK_SIZE;
check=0;
} else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)
errx(MKFS_EX_ERROR, _("will not try to make filesystem on '%s'"), device_name);
}
if (BLOCKS < 10)
errx(MKFS_EX_ERROR, _("%s: number of blocks too small"), device_name);