diff options
Diffstat (limited to 'e2fsprogs/mke2fs.c')
-rw-r--r-- | e2fsprogs/mke2fs.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/e2fsprogs/mke2fs.c b/e2fsprogs/mke2fs.c index 9c4f1c4d0..10563e2d9 100644 --- a/e2fsprogs/mke2fs.c +++ b/e2fsprogs/mke2fs.c | |||
@@ -107,9 +107,9 @@ static const struct mke2fs_defaults settings[] = { | |||
107 | { default_str, 3, 1024, 8192 }, | 107 | { default_str, 3, 1024, 8192 }, |
108 | { "journal", 0, 4096, 8192 }, | 108 | { "journal", 0, 4096, 8192 }, |
109 | { "news", 0, 4096, 4096 }, | 109 | { "news", 0, 4096, 4096 }, |
110 | { "largefile", 0, 4096, 1024 * 1024 }, | 110 | { "largefile", 0, 4096, 1024 * 1024 }, |
111 | { "largefile4", 0, 4096, 4096 * 1024 }, | 111 | { "largefile4", 0, 4096, 4096 * 1024 }, |
112 | { 0, 0, 0, 0}, | 112 | { 0, 0, 0, 0}, |
113 | }; | 113 | }; |
114 | 114 | ||
115 | static void set_fs_defaults(const char *fs_type, | 115 | static void set_fs_defaults(const char *fs_type, |
@@ -448,7 +448,7 @@ static void write_inode_tables(ext2_filsys fs) | |||
448 | num = fs->inode_blocks_per_group; | 448 | num = fs->inode_blocks_per_group; |
449 | 449 | ||
450 | retval = zero_blocks(fs, blk, num, 0, &blk, &num); | 450 | retval = zero_blocks(fs, blk, num, 0, &blk, &num); |
451 | mke2fs_error_msg_and_die(retval, | 451 | mke2fs_error_msg_and_die(retval, |
452 | "write %d blocks in inode table starting at %d.", | 452 | "write %d blocks in inode table starting at %d.", |
453 | num, blk); | 453 | num, blk); |
454 | if (sync_kludge) { | 454 | if (sync_kludge) { |
@@ -572,7 +572,7 @@ static void zap_sector(ext2_filsys fs, int sect, int nsect) | |||
572 | 572 | ||
573 | static void create_journal_dev(ext2_filsys fs) | 573 | static void create_journal_dev(ext2_filsys fs) |
574 | { | 574 | { |
575 | struct progress_struct progress; | 575 | struct progress_struct progress; |
576 | errcode_t retval; | 576 | errcode_t retval; |
577 | char *buf; | 577 | char *buf; |
578 | char *fmt = "%s journal superblock"; | 578 | char *fmt = "%s journal superblock"; |
@@ -624,7 +624,7 @@ static void show_stats(ext2_filsys fs) | |||
624 | os, | 624 | os, |
625 | fs->blocksize, s->s_log_block_size, | 625 | fs->blocksize, s->s_log_block_size, |
626 | fs->fragsize, s->s_log_frag_size, | 626 | fs->fragsize, s->s_log_frag_size, |
627 | s->s_inodes_count, s->s_blocks_count, | 627 | s->s_inodes_count, s->s_blocks_count, |
628 | s->s_r_blocks_count, 100.0 * s->s_r_blocks_count / s->s_blocks_count, | 628 | s->s_r_blocks_count, 100.0 * s->s_r_blocks_count / s->s_blocks_count, |
629 | s->s_first_data_block); | 629 | s->s_first_data_block); |
630 | free(os); | 630 | free(os); |
@@ -679,7 +679,7 @@ static int set_os(struct ext2_super_block *sb, char *os) | |||
679 | if((sb->s_creator_os = e2p_string2os(os)) >= 0) { | 679 | if((sb->s_creator_os = e2p_string2os(os)) >= 0) { |
680 | return 1; | 680 | return 1; |
681 | } else if (!strcasecmp("GNU", os)) { | 681 | } else if (!strcasecmp("GNU", os)) { |
682 | sb->s_creator_os = EXT2_OS_HURD; | 682 | sb->s_creator_os = EXT2_OS_HURD; |
683 | return 1; | 683 | return 1; |
684 | } | 684 | } |
685 | return 0; | 685 | return 0; |
@@ -842,7 +842,7 @@ static int PRS(int argc, char *argv[]) | |||
842 | #endif | 842 | #endif |
843 | 843 | ||
844 | /* If called as mkfs.ext3, create a journal inode */ | 844 | /* If called as mkfs.ext3, create a journal inode */ |
845 | if (last_char_is(bb_applet_name, '3')) | 845 | if (last_char_is(bb_applet_name, '3')) |
846 | journal_size = -1; | 846 | journal_size = -1; |
847 | 847 | ||
848 | while ((c = getopt (argc, argv, | 848 | while ((c = getopt (argc, argv, |
@@ -886,8 +886,8 @@ BLOCKSIZE_ERROR: | |||
886 | } | 886 | } |
887 | break; | 887 | break; |
888 | case 'i': | 888 | case 'i': |
889 | if (safe_strtoi(optarg, &inode_ratio) | 889 | if (safe_strtoi(optarg, &inode_ratio) |
890 | || inode_ratio < EXT2_MIN_BLOCK_SIZE | 890 | || inode_ratio < EXT2_MIN_BLOCK_SIZE |
891 | || inode_ratio > EXT2_MAX_BLOCK_SIZE * 1024) { | 891 | || inode_ratio > EXT2_MAX_BLOCK_SIZE * 1024) { |
892 | bb_error_msg_and_die("bad inode ratio %s (min %d/max %d)", | 892 | bb_error_msg_and_die("bad inode ratio %s (min %d/max %d)", |
893 | optarg, EXT2_MIN_BLOCK_SIZE, | 893 | optarg, EXT2_MIN_BLOCK_SIZE, |