diff options
Diffstat (limited to 'util-linux/mkfs_minix.c')
-rw-r--r-- | util-linux/mkfs_minix.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index e191acbd0..8f791cf66 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c | |||
@@ -262,7 +262,7 @@ static int get_free_block(void) | |||
262 | int blk; | 262 | int blk; |
263 | 263 | ||
264 | if (G.used_good_blocks + 1 >= MAX_GOOD_BLOCKS) | 264 | if (G.used_good_blocks + 1 >= MAX_GOOD_BLOCKS) |
265 | bb_error_msg_and_die("too many bad blocks"); | 265 | bb_simple_error_msg_and_die("too many bad blocks"); |
266 | if (G.used_good_blocks) | 266 | if (G.used_good_blocks) |
267 | blk = G.good_blocks_table[G.used_good_blocks - 1] + 1; | 267 | blk = G.good_blocks_table[G.used_good_blocks - 1] + 1; |
268 | else | 268 | else |
@@ -270,7 +270,7 @@ static int get_free_block(void) | |||
270 | while (blk < SB_ZONES && zone_in_use(blk)) | 270 | while (blk < SB_ZONES && zone_in_use(blk)) |
271 | blk++; | 271 | blk++; |
272 | if (blk >= SB_ZONES) | 272 | if (blk >= SB_ZONES) |
273 | bb_error_msg_and_die("not enough good blocks"); | 273 | bb_simple_error_msg_and_die("not enough good blocks"); |
274 | G.good_blocks_table[G.used_good_blocks] = blk; | 274 | G.good_blocks_table[G.used_good_blocks] = blk; |
275 | G.used_good_blocks++; | 275 | G.used_good_blocks++; |
276 | return blk; | 276 | return blk; |
@@ -342,7 +342,7 @@ static void make_bad_inode(void) | |||
342 | goto end_bad; | 342 | goto end_bad; |
343 | } | 343 | } |
344 | } | 344 | } |
345 | bb_error_msg_and_die("too many bad blocks"); | 345 | bb_simple_error_msg_and_die("too many bad blocks"); |
346 | end_bad: | 346 | end_bad: |
347 | if (ind) | 347 | if (ind) |
348 | write_block(ind, (char *) ind_block); | 348 | write_block(ind, (char *) ind_block); |
@@ -398,7 +398,7 @@ static void make_bad_inode2(void) | |||
398 | } | 398 | } |
399 | } | 399 | } |
400 | /* Could make triple indirect block here */ | 400 | /* Could make triple indirect block here */ |
401 | bb_error_msg_and_die("too many bad blocks"); | 401 | bb_simple_error_msg_and_die("too many bad blocks"); |
402 | end_bad: | 402 | end_bad: |
403 | if (ind) | 403 | if (ind) |
404 | write_block(ind, (char *) ind_block); | 404 | write_block(ind, (char *) ind_block); |
@@ -514,7 +514,7 @@ static void check_blocks(void) | |||
514 | if (got == try) | 514 | if (got == try) |
515 | continue; | 515 | continue; |
516 | if (G.currently_testing < SB_FIRSTZONE) | 516 | if (G.currently_testing < SB_FIRSTZONE) |
517 | bb_error_msg_and_die("bad blocks before data-area: cannot make fs"); | 517 | bb_simple_error_msg_and_die("bad blocks before data-area: cannot make fs"); |
518 | mark_zone(G.currently_testing); | 518 | mark_zone(G.currently_testing); |
519 | G.badblocks++; | 519 | G.badblocks++; |
520 | G.currently_testing++; | 520 | G.currently_testing++; |
@@ -588,7 +588,7 @@ static void setup_tables(void) | |||
588 | SB_ZMAPS = sb_zmaps; | 588 | SB_ZMAPS = sb_zmaps; |
589 | /* new SB_ZMAPS, need to recalc NORM_FIRSTZONE */ | 589 | /* new SB_ZMAPS, need to recalc NORM_FIRSTZONE */ |
590 | } while (--i); | 590 | } while (--i); |
591 | bb_error_msg_and_die("incompatible size/inode count, try different -i N"); | 591 | bb_simple_error_msg_and_die("incompatible size/inode count, try different -i N"); |
592 | got_it: | 592 | got_it: |
593 | 593 | ||
594 | SB_FIRSTZONE = norm_firstzone; | 594 | SB_FIRSTZONE = norm_firstzone; |
@@ -623,10 +623,10 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv) | |||
623 | G.magic = MINIX1_SUPER_MAGIC2; | 623 | G.magic = MINIX1_SUPER_MAGIC2; |
624 | 624 | ||
625 | if (INODE_SIZE1 * MINIX1_INODES_PER_BLOCK != BLOCK_SIZE) | 625 | if (INODE_SIZE1 * MINIX1_INODES_PER_BLOCK != BLOCK_SIZE) |
626 | bb_error_msg_and_die("bad inode size"); | 626 | bb_simple_error_msg_and_die("bad inode size"); |
627 | #if ENABLE_FEATURE_MINIX2 | 627 | #if ENABLE_FEATURE_MINIX2 |
628 | if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE) | 628 | if (INODE_SIZE2 * MINIX2_INODES_PER_BLOCK != BLOCK_SIZE) |
629 | bb_error_msg_and_die("bad inode size"); | 629 | bb_simple_error_msg_and_die("bad inode size"); |
630 | #endif | 630 | #endif |
631 | 631 | ||
632 | opt = getopt32(argv, "ci:l:n:+v", &str_i, &listfile, &G.namelen); | 632 | opt = getopt32(argv, "ci:l:n:+v", &str_i, &listfile, &G.namelen); |
@@ -644,7 +644,7 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv) | |||
644 | #if ENABLE_FEATURE_MINIX2 | 644 | #if ENABLE_FEATURE_MINIX2 |
645 | version2 = 1; | 645 | version2 = 1; |
646 | #else | 646 | #else |
647 | bb_error_msg_and_die("not compiled with minix v2 support"); | 647 | bb_simple_error_msg_and_die("not compiled with minix v2 support"); |
648 | #endif | 648 | #endif |
649 | } | 649 | } |
650 | 650 | ||
@@ -654,14 +654,14 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv) | |||
654 | 654 | ||
655 | /* Check if it is mounted */ | 655 | /* Check if it is mounted */ |
656 | if (find_mount_point(G.device_name, 0)) | 656 | if (find_mount_point(G.device_name, 0)) |
657 | bb_error_msg_and_die("can't format mounted filesystem"); | 657 | bb_simple_error_msg_and_die("can't format mounted filesystem"); |
658 | 658 | ||
659 | xmove_fd(xopen(G.device_name, O_RDWR), dev_fd); | 659 | xmove_fd(xopen(G.device_name, O_RDWR), dev_fd); |
660 | 660 | ||
661 | G.total_blocks = get_volume_size_in_bytes(dev_fd, argv[1], 1024, /*extend:*/ 1) / 1024; | 661 | G.total_blocks = get_volume_size_in_bytes(dev_fd, argv[1], 1024, /*extend:*/ 1) / 1024; |
662 | 662 | ||
663 | if (G.total_blocks < 10) | 663 | if (G.total_blocks < 10) |
664 | bb_error_msg_and_die("must have at least 10 blocks"); | 664 | bb_simple_error_msg_and_die("must have at least 10 blocks"); |
665 | 665 | ||
666 | if (version2) { | 666 | if (version2) { |
667 | G.magic = MINIX2_SUPER_MAGIC2; | 667 | G.magic = MINIX2_SUPER_MAGIC2; |