X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=misc%2Fmke2fs.c;h=0e4d493e8c5b25cbbe4b0ded3d17679da10eaf6c;hb=refs%2Fchanges%2F61%2F15761%2F21;hp=e28828ee61e66524c36635fdfab7b57410ce767d;hpb=8185ab9f38f0e9cd06feab9d8e59d059bde84bf6;p=tools%2Fe2fsprogs.git diff --git a/misc/mke2fs.c b/misc/mke2fs.c index e28828e..0e4d493 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -18,15 +18,13 @@ #define _XOPEN_SOURCE 600 /* for inclusion of PATH_MAX in Solaris */ +#include "config.h" #include #include #include #include #include #include -#ifdef __linux__ -#include -#endif #ifdef HAVE_GETOPT_H #include #else @@ -42,9 +40,6 @@ extern int optind; #ifdef HAVE_ERRNO_H #include #endif -#ifdef HAVE_MNTENT_H -#include -#endif #include #include #include @@ -53,6 +48,7 @@ extern int optind; #include #include "ext2fs/ext2_fs.h" +#include "ext2fs/ext2fsP.h" #include "et/com_err.h" #include "uuid/uuid.h" #include "e2p/e2p.h" @@ -62,63 +58,80 @@ extern int optind; #include "prof_err.h" #include "../version.h" #include "nls-enable.h" +#include "quota/quotaio.h" +#include "mke2fs.h" #define STRIDE_LENGTH 8 +#define MAX_32_NUM ((((unsigned long long) 1) << 32) - 1) + #ifndef __sparc__ #define ZAP_BOOTBLOCK #endif +#define DISCARD_STEP_MB (2048) + extern int isatty(int); extern FILE *fpopen(const char *cmd, const char *mode); const char * program_name = "mke2fs"; -const char * device_name /* = NULL */; +static const char * device_name /* = NULL */; /* Command line options */ -int cflag; +static int cflag; int verbose; int quiet; -int super_only; -int discard = 1; /* attempt to discard device before fs creation */ -int force; -int noaction; +static int super_only; +static int discard = 1; /* attempt to discard device before fs creation */ +static int direct_io; +static int force; +static int noaction; +static int num_backups = 2; /* number of backup bg's for sparse_super2 */ +static uid_t root_uid; +static gid_t root_gid; int journal_size; int journal_flags; -int lazy_itable_init; -char *bad_blocks_filename; -__u32 fs_stride; - -struct ext2_super_block fs_param; -char *fs_uuid = NULL; -char *creator_os; -char *volume_label; -char *mount_dir; +static int lazy_itable_init; +static int packed_meta_blocks; +static char *bad_blocks_filename = NULL; +static __u32 fs_stride; +/* Initialize usr/grp quotas by default */ +static unsigned int quotatype_bits = (QUOTA_USR_BIT | QUOTA_GRP_BIT); +static __u64 offset; +static blk64_t journal_location = ~0LL; +static int proceed_delay = -1; +static blk64_t dev_size; + +static struct ext2_super_block fs_param; +static char *fs_uuid = NULL; +static char *creator_os; +static char *volume_label; +static char *mount_dir; char *journal_device; -int sync_kludge; /* Set using the MKE2FS_SYNC env. option */ +static int sync_kludge; /* Set using the MKE2FS_SYNC env. option */ char **fs_types; -profile_t profile; +static profile_t profile; -int sys_page_size = 4096; -int linux_version_code = 0; +static int sys_page_size = 4096; static void usage(void) { fprintf(stderr, _("Usage: %s [-c|-l filename] [-b block-size] " - "[-f fragment-size]\n\t[-i bytes-per-inode] [-I inode-size] " + "[-C cluster-size]\n\t[-i bytes-per-inode] [-I inode-size] " "[-J journal-options]\n" - "\t[-G meta group size] [-N number-of-inodes]\n" + "\t[-G flex-group-size] [-N number-of-inodes]\n" "\t[-m reserved-blocks-percentage] [-o creator-os]\n" "\t[-g blocks-per-group] [-L volume-label] " "[-M last-mounted-directory]\n\t[-O feature[,...]] " "[-r fs-revision] [-E extended-option[,...]]\n" - "\t[-T fs-type] [-U UUID] [-jnqvFKSV] device [blocks-count]\n"), + "\t[-t fs-type] [-T usage-type ] [-U UUID] " + "[-jnqvDFKSV] device [blocks-count]\n"), program_name); exit(1); } -static int int_log2(int arg) +static int int_log2(unsigned long long arg) { int l = 0; @@ -130,7 +143,7 @@ static int int_log2(int arg) return l; } -static int int_log10(unsigned int arg) +int int_log10(unsigned long long arg) { int l; @@ -139,28 +152,6 @@ static int int_log10(unsigned int arg) return l; } -static int parse_version_number(const char *s) -{ - int major, minor, rev; - char *endptr; - const char *cp = s; - - if (!s) - return 0; - major = strtol(cp, &endptr, 10); - if (cp == endptr || *endptr != '.') - return 0; - cp = endptr + 1; - minor = strtol(cp, &endptr, 10); - if (cp == endptr || *endptr != '.') - return 0; - cp = endptr + 1; - rev = strtol(cp, &endptr, 10); - if (cp == endptr) - return 0; - return ((((major * 256) + minor) * 256) + rev); -} - /* * Helper function for read_bb_file and test_disk */ @@ -188,7 +179,7 @@ static void read_bb_file(ext2_filsys fs, badblocks_list *bb_list, retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block); fclose (f); if (retval) { - com_err("ext2fs_read_bb_FILE", retval, + com_err("ext2fs_read_bb_FILE", retval, "%s", _("while reading in list of bad blocks from file")); exit(1); } @@ -203,9 +194,9 @@ static void test_disk(ext2_filsys fs, badblocks_list *bb_list) errcode_t retval; char buf[1024]; - sprintf(buf, "badblocks -b %d -X %s%s%s %u", fs->blocksize, + sprintf(buf, "badblocks -b %d -X %s%s%s %llu", fs->blocksize, quiet ? "" : "-s ", (cflag > 1) ? "-w " : "", - fs->device_name, fs->super->s_blocks_count-1); + fs->device_name, ext2fs_blocks_count(fs->super)-1); if (verbose) printf(_("Running command: %s\n"), buf); f = popen(buf, "r"); @@ -217,7 +208,7 @@ static void test_disk(ext2_filsys fs, badblocks_list *bb_list) retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block); pclose(f); if (retval) { - com_err("ext2fs_read_bb_FILE", retval, + com_err("ext2fs_read_bb_FILE", retval, "%s", _("while processing list of bad blocks from program")); exit(1); } @@ -274,10 +265,10 @@ _("Warning: the backup superblock/group descriptors at block %u contain\n" " bad blocks.\n\n"), group_block); group_bad++; - group = ext2fs_group_of_blk(fs, group_block+j); - fs->group_desc[group].bg_free_blocks_count++; + group = ext2fs_group_of_blk2(fs, group_block+j); + ext2fs_bg_free_blocks_count_set(fs, group, ext2fs_bg_free_blocks_count(fs, group) + 1); ext2fs_group_desc_csum_set(fs, group); - fs->super->s_free_blocks_count++; + ext2fs_free_blocks_count_add(fs->super, 1); } } group_block += fs->super->s_blocks_per_group; @@ -288,105 +279,82 @@ _("Warning: the backup superblock/group descriptors at block %u contain\n" */ retval = ext2fs_badblocks_list_iterate_begin(bb_list, &bb_iter); if (retval) { - com_err("ext2fs_badblocks_list_iterate_begin", retval, + com_err("ext2fs_badblocks_list_iterate_begin", retval, "%s", _("while marking bad blocks as used")); exit(1); } while (ext2fs_badblocks_list_iterate(bb_iter, &blk)) - ext2fs_mark_block_bitmap(fs->block_map, blk); + ext2fs_mark_block_bitmap2(fs->block_map, EXT2FS_B2C(fs, blk)); ext2fs_badblocks_list_iterate_end(bb_iter); } -/* - * These functions implement a generalized progress meter. - */ -struct progress_struct { - char format[20]; - char backup[80]; - __u32 max; - int skip_progress; -}; - -static void progress_init(struct progress_struct *progress, - const char *label,__u32 max) -{ - int i; - - memset(progress, 0, sizeof(struct progress_struct)); - if (quiet) - return; - - /* - * Figure out how many digits we need - */ - i = int_log10(max); - sprintf(progress->format, "%%%dd/%%%dld", i, i); - memset(progress->backup, '\b', sizeof(progress->backup)-1); - progress->backup[sizeof(progress->backup)-1] = 0; - if ((2*i)+1 < (int) sizeof(progress->backup)) - progress->backup[(2*i)+1] = 0; - progress->max = max; - - progress->skip_progress = 0; - if (getenv("MKE2FS_SKIP_PROGRESS")) - progress->skip_progress++; - - fputs(label, stdout); - fflush(stdout); -} - -static void progress_update(struct progress_struct *progress, __u32 val) +static errcode_t packed_allocate_tables(ext2_filsys fs) { - if ((progress->format[0] == 0) || progress->skip_progress) - return; - printf(progress->format, val, progress->max); - fputs(progress->backup, stdout); -} + errcode_t retval; + dgrp_t i; + blk64_t goal = 0; -static void progress_close(struct progress_struct *progress) -{ - if (progress->format[0] == 0) - return; - fputs(_("done \n"), stdout); + for (i = 0; i < fs->group_desc_count; i++) { + retval = ext2fs_new_block2(fs, goal, NULL, &goal); + if (retval) + return retval; + ext2fs_block_alloc_stats2(fs, goal, +1); + ext2fs_block_bitmap_loc_set(fs, i, goal); + } + for (i = 0; i < fs->group_desc_count; i++) { + retval = ext2fs_new_block2(fs, goal, NULL, &goal); + if (retval) + return retval; + ext2fs_block_alloc_stats2(fs, goal, +1); + ext2fs_inode_bitmap_loc_set(fs, i, goal); + } + for (i = 0; i < fs->group_desc_count; i++) { + blk64_t end = ext2fs_blocks_count(fs->super) - 1; + retval = ext2fs_get_free_blocks2(fs, goal, end, + fs->inode_blocks_per_group, + fs->block_map, &goal); + if (retval) + return retval; + ext2fs_block_alloc_stats_range(fs, goal, + fs->inode_blocks_per_group, +1); + ext2fs_inode_table_loc_set(fs, i, goal); + ext2fs_group_desc_csum_set(fs, i); + } + return 0; } static void write_inode_tables(ext2_filsys fs, int lazy_flag, int itable_zeroed) { errcode_t retval; - blk_t blk; + blk64_t blk; dgrp_t i; - int num, ipb; - struct progress_struct progress; + int num; + struct ext2fs_numeric_progress_struct progress; - if (quiet) - memset(&progress, 0, sizeof(progress)); - else - progress_init(&progress, _("Writing inode tables: "), - fs->group_desc_count); + ext2fs_numeric_progress_init(fs, &progress, + _("Writing inode tables: "), + fs->group_desc_count); for (i = 0; i < fs->group_desc_count; i++) { - progress_update(&progress, i); + ext2fs_numeric_progress_update(fs, &progress, i); - blk = fs->group_desc[i].bg_inode_table; + blk = ext2fs_inode_table_loc(fs, i); num = fs->inode_blocks_per_group; - if (lazy_flag) { - ipb = fs->blocksize / EXT2_INODE_SIZE(fs->super); - num = ((((fs->super->s_inodes_per_group - - fs->group_desc[i].bg_itable_unused) * - EXT2_INODE_SIZE(fs->super)) + - EXT2_BLOCK_SIZE(fs->super) - 1) / - EXT2_BLOCK_SIZE(fs->super)); - } + if (lazy_flag) + num = ext2fs_div_ceil((fs->super->s_inodes_per_group - + ext2fs_bg_itable_unused(fs, i)) * + EXT2_INODE_SIZE(fs->super), + EXT2_BLOCK_SIZE(fs->super)); if (!lazy_flag || itable_zeroed) { /* The kernel doesn't need to zero the itable blocks */ - fs->group_desc[i].bg_flags |= EXT2_BG_INODE_ZEROED; + ext2fs_bg_flags_set(fs, i, EXT2_BG_INODE_ZEROED); ext2fs_group_desc_csum_set(fs, i); } - retval = ext2fs_zero_blocks(fs, blk, num, &blk, &num); + retval = ext2fs_zero_blocks2(fs, blk, num, &blk, &num); if (retval) { fprintf(stderr, _("\nCould not write %d " - "blocks in inode table starting at %u: %s\n"), + "blocks in inode table starting at %llu: %s\n"), num, blk, error_message(retval)); exit(1); } @@ -397,39 +365,38 @@ static void write_inode_tables(ext2_filsys fs, int lazy_flag, int itable_zeroed) sync(); } } - ext2fs_zero_blocks(0, 0, 0, 0, 0); - progress_close(&progress); + ext2fs_zero_blocks2(0, 0, 0, 0, 0); + ext2fs_numeric_progress_close(fs, &progress, + _("done \n")); } static void create_root_dir(ext2_filsys fs) { errcode_t retval; struct ext2_inode inode; - __u32 uid, gid; retval = ext2fs_mkdir(fs, EXT2_ROOT_INO, EXT2_ROOT_INO, 0); if (retval) { - com_err("ext2fs_mkdir", retval, _("while creating root dir")); + com_err("ext2fs_mkdir", retval, "%s", + _("while creating root dir")); exit(1); } - if (geteuid()) { + if (root_uid != 0 || root_gid != 0) { retval = ext2fs_read_inode(fs, EXT2_ROOT_INO, &inode); if (retval) { - com_err("ext2fs_read_inode", retval, + com_err("ext2fs_read_inode", retval, "%s", _("while reading root inode")); exit(1); } - uid = getuid(); - inode.i_uid = uid; - ext2fs_set_i_uid_high(inode, uid >> 16); - if (uid) { - gid = getgid(); - inode.i_gid = gid; - ext2fs_set_i_gid_high(inode, gid >> 16); - } + + inode.i_uid = root_uid; + ext2fs_set_i_uid_high(inode, root_uid >> 16); + inode.i_gid = root_gid; + ext2fs_set_i_gid_high(inode, root_gid >> 16); + retval = ext2fs_write_new_inode(fs, EXT2_ROOT_INO, &inode); if (retval) { - com_err("ext2fs_write_inode", retval, + com_err("ext2fs_write_inode", retval, "%s", _("while setting root inode ownership")); exit(1); } @@ -447,14 +414,14 @@ static void create_lost_and_found(ext2_filsys fs) fs->umask = 077; retval = ext2fs_mkdir(fs, EXT2_ROOT_INO, 0, name); if (retval) { - com_err("ext2fs_mkdir", retval, + com_err("ext2fs_mkdir", retval, "%s", _("while creating /lost+found")); exit(1); } retval = ext2fs_lookup(fs, EXT2_ROOT_INO, name, strlen(name), 0, &ino); if (retval) { - com_err("ext2_lookup", retval, + com_err("ext2_lookup", retval, "%s", _("while looking up /lost+found")); exit(1); } @@ -467,7 +434,7 @@ static void create_lost_and_found(ext2_filsys fs) break; retval = ext2fs_expand_dir(fs, ino); if (retval) { - com_err("ext2fs_expand_dir", retval, + com_err("ext2fs_expand_dir", retval, "%s", _("while expanding /lost+found")); exit(1); } @@ -478,11 +445,11 @@ static void create_bad_block_inode(ext2_filsys fs, badblocks_list bb_list) { errcode_t retval; - ext2fs_mark_inode_bitmap(fs->inode_map, EXT2_BAD_INO); + ext2fs_mark_inode_bitmap2(fs->inode_map, EXT2_BAD_INO); ext2fs_inode_alloc_stats2(fs, EXT2_BAD_INO, +1, 0); retval = ext2fs_update_bb_inode(fs, bb_list); if (retval) { - com_err("ext2fs_update_bb_inode", retval, + com_err("ext2fs_update_bb_inode", retval, "%s", _("while setting bad block inode")); exit(1); } @@ -517,7 +484,7 @@ static void zap_sector(ext2_filsys fs, int sect, int nsect) if (sect == 0) { /* Check for a BSD disklabel, and don't erase it if so */ - retval = io_channel_read_blk(fs->io, 0, -512, buf); + retval = io_channel_read_blk64(fs->io, 0, -512, buf); if (retval) fprintf(stderr, _("Warning: could not read block 0: %s\n"), @@ -532,7 +499,7 @@ static void zap_sector(ext2_filsys fs, int sect, int nsect) memset(buf, 0, 512*nsect); io_channel_set_blksize(fs->io, 512); - retval = io_channel_write_blk(fs->io, sect, -512*nsect, buf); + retval = io_channel_write_blk64(fs->io, sect, -512*nsect, buf); io_channel_set_blksize(fs->io, fs->blocksize); free(buf); if (retval) @@ -542,55 +509,57 @@ static void zap_sector(ext2_filsys fs, int sect, int nsect) static void create_journal_dev(ext2_filsys fs) { - struct progress_struct progress; + struct ext2fs_numeric_progress_struct progress; errcode_t retval; char *buf; - blk_t blk, err_blk; + blk64_t blk, err_blk; int c, count, err_count; retval = ext2fs_create_journal_superblock(fs, - fs->super->s_blocks_count, 0, &buf); + ext2fs_blocks_count(fs->super), 0, &buf); if (retval) { - com_err("create_journal_dev", retval, + com_err("create_journal_dev", retval, "%s", _("while initializing journal superblock")); exit(1); } - if (quiet) - memset(&progress, 0, sizeof(progress)); - else - progress_init(&progress, _("Zeroing journal device: "), - fs->super->s_blocks_count); + if (journal_flags & EXT2_MKJOURNAL_LAZYINIT) + goto write_superblock; + + ext2fs_numeric_progress_init(fs, &progress, + _("Zeroing journal device: "), + ext2fs_blocks_count(fs->super)); blk = 0; - count = fs->super->s_blocks_count; + count = ext2fs_blocks_count(fs->super); while (count > 0) { if (count > 1024) c = 1024; else c = count; - retval = ext2fs_zero_blocks(fs, blk, c, &err_blk, &err_count); + retval = ext2fs_zero_blocks2(fs, blk, c, &err_blk, &err_count); if (retval) { com_err("create_journal_dev", retval, _("while zeroing journal device " - "(block %u, count %d)"), + "(block %llu, count %d)"), err_blk, err_count); exit(1); } blk += c; count -= c; - progress_update(&progress, blk); + ext2fs_numeric_progress_update(fs, &progress, blk); } - ext2fs_zero_blocks(0, 0, 0, 0, 0); + ext2fs_zero_blocks2(0, 0, 0, 0, 0); - retval = io_channel_write_blk(fs->io, - fs->super->s_first_data_block+1, - 1, buf); + ext2fs_numeric_progress_close(fs, &progress, NULL); +write_superblock: + retval = io_channel_write_blk64(fs->io, + fs->super->s_first_data_block+1, + 1, buf); if (retval) { - com_err("create_journal_dev", retval, + com_err("create_journal_dev", retval, "%s", _("while writing journal superblock")); exit(1); } - progress_close(&progress); } static void show_stats(ext2_filsys fs) @@ -598,22 +567,29 @@ static void show_stats(ext2_filsys fs) struct ext2_super_block *s = fs->super; char buf[80]; char *os; - blk_t group_block; + blk64_t group_block; dgrp_t i; int need, col_left; - if (fs_param.s_blocks_count != s->s_blocks_count) - fprintf(stderr, _("warning: %u blocks unused.\n\n"), - fs_param.s_blocks_count - s->s_blocks_count); + if (!verbose) { + printf(_("Creating filesystem with %llu %dk blocks and " + "%u inodes\n"), + ext2fs_blocks_count(s), fs->blocksize >> 10, + s->s_inodes_count); + goto skip_details; + } + + if (ext2fs_blocks_count(&fs_param) != ext2fs_blocks_count(s)) + fprintf(stderr, _("warning: %llu blocks unused.\n\n"), + ext2fs_blocks_count(&fs_param) - ext2fs_blocks_count(s)); memset(buf, 0, sizeof(buf)); strncpy(buf, s->s_volume_name, sizeof(s->s_volume_name)); printf(_("Filesystem label=%s\n"), buf); - fputs(_("OS type: "), stdout); - os = e2p_os2string(fs->super->s_creator_os); - fputs(os, stdout); + os = e2p_os2string(fs->super->s_creator_os); + if (os) + printf(_("OS type: %s\n"), os); free(os); - printf("\n"); printf(_("Block size=%u (log=%u)\n"), fs->blocksize, s->s_log_block_size); if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super, @@ -626,12 +602,14 @@ static void show_stats(ext2_filsys fs) s->s_log_cluster_size); printf(_("Stride=%u blocks, Stripe width=%u blocks\n"), s->s_raid_stride, s->s_raid_stripe_width); - printf(_("%u inodes, %u blocks\n"), s->s_inodes_count, - s->s_blocks_count); - printf(_("%u blocks (%2.2f%%) reserved for the super user\n"), - s->s_r_blocks_count, - 100.0 * s->s_r_blocks_count / s->s_blocks_count); + printf(_("%u inodes, %llu blocks\n"), s->s_inodes_count, + ext2fs_blocks_count(s)); + printf(_("%llu blocks (%2.2f%%) reserved for the super user\n"), + ext2fs_r_blocks_count(s), + 100.0 * ext2fs_r_blocks_count(s) / ext2fs_blocks_count(s)); printf(_("First data block=%u\n"), s->s_first_data_block); + if (root_uid != 0 || root_gid != 0) + printf(_("Root directory owner=%u:%u\n"), root_uid, root_gid); if (s->s_reserved_gdt_blocks) printf(_("Maximum filesystem blocks=%lu\n"), (s->s_reserved_gdt_blocks + fs->desc_blocks) * @@ -649,12 +627,15 @@ static void show_stats(ext2_filsys fs) s->s_blocks_per_group, s->s_clusters_per_group); printf(_("%u inodes per group\n"), s->s_inodes_per_group); +skip_details: if (fs->group_desc_count == 1) { printf("\n"); return; } - printf(_("Superblock backups stored on blocks: ")); + if (!e2p_is_null_uuid(s->s_uuid)) + printf(_("Filesystem UUID: %s\n"), e2p_uuid2str(s->s_uuid)); + printf("%s", _("Superblock backups stored on blocks: ")); group_block = s->s_first_data_block; col_left = 0; for (i = 1; i < fs->group_desc_count; i++) { @@ -669,7 +650,7 @@ static void show_stats(ext2_filsys fs) col_left = 72; } col_left -= need; - printf("%u", group_block); + printf("%llu", group_block); } printf("\n\n"); } @@ -697,17 +678,33 @@ static int set_os(struct ext2_super_block *sb, char *os) #define PATH_SET "PATH=/sbin" +static int option_handle_function(char *token, void *data) +{ + if (!strncmp(token, "usr", 3)) { + quotatype_bits |= QUOTA_USR_BIT; + } else if (!strncmp(token, "grp", 3)) { + quotatype_bits |= QUOTA_GRP_BIT; + } else { + fprintf(stderr, _("Invalid quotatype parameter: %s\n"), + token); + return 1; + } + return 0; + +} + static void parse_extended_opts(struct ext2_super_block *param, const char *opts) { char *buf, *token, *next, *p, *arg, *badopt = 0; int len; int r_usage = 0; + int ret; len = strlen(opts); buf = malloc(len+1); if (!buf) { - fprintf(stderr, + fprintf(stderr, "%s", _("Couldn't allocate memory to parse options!\n")); exit(1); } @@ -724,14 +721,94 @@ static void parse_extended_opts(struct ext2_super_block *param, *arg = 0; arg++; } - if (strcmp(token, "stride") == 0) { + if (strcmp(token, "desc-size") == 0 || + strcmp(token, "desc_size") == 0) { + int desc_size; + + if (!(fs_param.s_feature_incompat & + EXT4_FEATURE_INCOMPAT_64BIT)) { + fprintf(stderr, + _("%s requires '-O 64bit'\n"), token); + r_usage++; + continue; + } + if (param->s_reserved_gdt_blocks != 0) { + fprintf(stderr, + _("'%s' must be before 'resize=%u'\n"), + token, param->s_reserved_gdt_blocks); + r_usage++; + continue; + } + if (!arg) { + r_usage++; + badopt = token; + continue; + } + desc_size = strtoul(arg, &p, 0); + if (*p || (desc_size & (desc_size - 1))) { + fprintf(stderr, + _("Invalid desc_size: '%s'\n"), arg); + r_usage++; + continue; + } + param->s_desc_size = desc_size; + } else if (strcmp(token, "offset") == 0) { + if (!arg) { + r_usage++; + badopt = token; + continue; + } + offset = strtoull(arg, &p, 0); + if (*p) { + fprintf(stderr, _("Invalid offset: %s\n"), + arg); + r_usage++; + continue; + } + } else if (strcmp(token, "mmp_update_interval") == 0) { + if (!arg) { + r_usage++; + badopt = token; + continue; + } + param->s_mmp_update_interval = strtoul(arg, &p, 0); + if (*p) { + fprintf(stderr, + _("Invalid mmp_update_interval: %s\n"), + arg); + r_usage++; + continue; + } + } else if (strcmp(token, "num_backup_sb") == 0) { + if (!arg) { + r_usage++; + badopt = token; + continue; + } + num_backups = strtoul(arg, &p, 0); + if (*p || num_backups > 2) { + fprintf(stderr, + _("Invalid # of backup " + "superblocks: %s\n"), + arg); + r_usage++; + continue; + } + } else if (strcmp(token, "packed_meta_blocks") == 0) { + if (arg) + packed_meta_blocks = strtoul(arg, &p, 0); + else + packed_meta_blocks = 1; + if (packed_meta_blocks) + journal_location = 0; + } else if (strcmp(token, "stride") == 0) { if (!arg) { r_usage++; badopt = token; continue; } param->s_raid_stride = strtoul(arg, &p, 0); - if (*p || (param->s_raid_stride == 0)) { + if (*p) { fprintf(stderr, _("Invalid stride parameter: %s\n"), arg); @@ -746,7 +823,7 @@ static void parse_extended_opts(struct ext2_super_block *param, continue; } param->s_raid_stripe_width = strtoul(arg, &p, 0); - if (*p || (param->s_raid_stripe_width == 0)) { + if (*p) { fprintf(stderr, _("Invalid stripe-width parameter: %s\n"), arg); @@ -754,7 +831,8 @@ static void parse_extended_opts(struct ext2_super_block *param, continue; } } else if (!strcmp(token, "resize")) { - unsigned long resize, bpg, rsv_groups; + blk64_t resize; + unsigned long bpg, rsv_groups; unsigned long group_desc_count, desc_blocks; unsigned int gdpb, blocksize; int rsv_gdb; @@ -765,8 +843,8 @@ static void parse_extended_opts(struct ext2_super_block *param, continue; } - resize = parse_num_blocks(arg, - param->s_log_block_size); + resize = parse_num_blocks2(arg, + param->s_log_block_size); if (resize == 0) { fprintf(stderr, @@ -775,8 +853,8 @@ static void parse_extended_opts(struct ext2_super_block *param, r_usage++; continue; } - if (resize <= param->s_blocks_count) { - fprintf(stderr, + if (resize <= ext2fs_blocks_count(param)) { + fprintf(stderr, "%s", _("The resize maximum must be greater " "than the filesystem size.\n")); r_usage++; @@ -788,11 +866,11 @@ static void parse_extended_opts(struct ext2_super_block *param, if (!bpg) bpg = blocksize * 8; gdpb = EXT2_DESC_PER_BLOCK(param); - group_desc_count = - ext2fs_div_ceil(param->s_blocks_count, bpg); + group_desc_count = (__u32) ext2fs_div64_ceil( + ext2fs_blocks_count(param), bpg); desc_blocks = (group_desc_count + gdpb - 1) / gdpb; - rsv_groups = ext2fs_div_ceil(resize, bpg); + rsv_groups = ext2fs_div64_ceil(resize, bpg); rsv_gdb = ext2fs_div_ceil(rsv_groups, gdpb) - desc_blocks; if (rsv_gdb > (int) EXT2_ADDR_PER_BLOCK(param)) @@ -800,7 +878,7 @@ static void parse_extended_opts(struct ext2_super_block *param, if (rsv_gdb > 0) { if (param->s_rev_level == EXT2_GOOD_OLD_REV) { - fprintf(stderr, + fprintf(stderr, "%s", _("On-line resizing not supported with revision 0 filesystems\n")); free(buf); exit(1); @@ -817,10 +895,51 @@ static void parse_extended_opts(struct ext2_super_block *param, lazy_itable_init = strtoul(arg, &p, 0); else lazy_itable_init = 1; + } else if (!strcmp(token, "lazy_journal_init")) { + if (arg) + journal_flags |= strtoul(arg, &p, 0) ? + EXT2_MKJOURNAL_LAZYINIT : 0; + else + journal_flags |= EXT2_MKJOURNAL_LAZYINIT; + } else if (!strcmp(token, "root_owner")) { + if (arg) { + root_uid = strtoul(arg, &p, 0); + if (*p != ':') { + fprintf(stderr, + _("Invalid root_owner: '%s'\n"), + arg); + r_usage++; + continue; + } + p++; + root_gid = strtoul(p, &p, 0); + if (*p) { + fprintf(stderr, + _("Invalid root_owner: '%s'\n"), + arg); + r_usage++; + continue; + } + } else { + root_uid = getuid(); + root_gid = getgid(); + } } else if (!strcmp(token, "discard")) { discard = 1; } else if (!strcmp(token, "nodiscard")) { discard = 0; + } else if (!strcmp(token, "quotatype")) { + if (!arg) { + r_usage++; + badopt = token; + continue; + } + ret = parse_quota_opts(arg, option_handle_function, + NULL); + if (ret) { + r_usage++; + continue; + } } else { r_usage++; badopt = token; @@ -832,13 +951,21 @@ static void parse_extended_opts(struct ext2_super_block *param, "and may take an argument which\n" "\tis set off by an equals ('=') sign.\n\n" "Valid extended options are:\n" + "\tmmp_update_interval=\n" + "\tnum_backup_sb=<0|1|2>\n" "\tstride=\n" "\tstripe-width=\n" + "\toffset=\n" "\tresize=\n" + "\tpacked_meta_blocks=<0 to disable, 1 to enable>\n" "\tlazy_itable_init=<0 to disable, 1 to enable>\n" + "\tlazy_journal_init=<0 to disable, 1 to enable>\n" + "\troot_uid=\n" + "\troot_gid=\n" "\ttest_fs\n" "\tdiscard\n" - "\tnodiscard\n\n"), + "\tnodiscard\n" + "\tquotatype=\n\n"), badopt ? badopt : ""); free(buf); exit(1); @@ -857,20 +984,30 @@ static __u32 ok_features[3] = { EXT3_FEATURE_COMPAT_HAS_JOURNAL | EXT2_FEATURE_COMPAT_RESIZE_INODE | EXT2_FEATURE_COMPAT_DIR_INDEX | - EXT2_FEATURE_COMPAT_EXT_ATTR, + EXT2_FEATURE_COMPAT_EXT_ATTR | + EXT4_FEATURE_COMPAT_SPARSE_SUPER2, /* Incompat */ EXT2_FEATURE_INCOMPAT_FILETYPE| EXT3_FEATURE_INCOMPAT_EXTENTS| EXT3_FEATURE_INCOMPAT_JOURNAL_DEV| EXT2_FEATURE_INCOMPAT_META_BG| - EXT4_FEATURE_INCOMPAT_FLEX_BG, + EXT4_FEATURE_INCOMPAT_FLEX_BG| + EXT4_FEATURE_INCOMPAT_EA_INODE| + EXT4_FEATURE_INCOMPAT_MMP | + EXT4_FEATURE_INCOMPAT_DIRDATA| + EXT4_FEATURE_INCOMPAT_64BIT, /* R/O compat */ EXT2_FEATURE_RO_COMPAT_LARGE_FILE| EXT4_FEATURE_RO_COMPAT_HUGE_FILE| EXT4_FEATURE_RO_COMPAT_DIR_NLINK| EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE| EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| - EXT4_FEATURE_RO_COMPAT_GDT_CSUM + EXT4_FEATURE_RO_COMPAT_GDT_CSUM| + EXT4_FEATURE_RO_COMPAT_BIGALLOC| +#ifdef CONFIG_QUOTA + EXT4_FEATURE_RO_COMPAT_QUOTA| +#endif + 0 }; @@ -960,7 +1097,7 @@ static void print_str_list(char **list) /* * Return TRUE if the profile has the given subsection */ -static int profile_has_subsection(profile_t profile, const char *section, +static int profile_has_subsection(profile_t prof, const char *section, const char *subsection) { void *state; @@ -972,7 +1109,7 @@ static int profile_has_subsection(profile_t profile, const char *section, names[1] = subsection; names[2] = 0; - if (profile_iterator_create(profile, names, + if (profile_iterator_create(prof, names, PROFILE_ITER_LIST_SECTION | PROFILE_ITER_RELATIONS_ONLY, &state)) return 0; @@ -988,7 +1125,8 @@ static int profile_has_subsection(profile_t profile, const char *section, static char **parse_fs_type(const char *fs_type, const char *usage_types, - struct ext2_super_block *fs_param, + struct ext2_super_block *sb, + blk64_t fs_blocks_count, char *progname) { const char *ext_type = 0; @@ -997,7 +1135,7 @@ static char **parse_fs_type(const char *fs_type, char *cp, *t; const char *size_type; struct str_list list; - unsigned long meg; + unsigned long long meg; int is_hurd = 0; if (init_list(&list)) @@ -1013,6 +1151,8 @@ static char **parse_fs_type(const char *fs_type, ext_type = "ext2"; else if (!strcmp(program_name, "mke3fs")) ext_type = "ext3"; + else if (!strcmp(program_name, "mke4fs")) + ext_type = "ext4"; else if (progname) { ext_type = strrchr(progname, '/'); if (ext_type) @@ -1043,35 +1183,37 @@ static char **parse_fs_type(const char *fs_type, "%s filesystem type.\n"), ext_type); if (!strcmp(ext_type, "ext3") || !strcmp(ext_type, "ext4") || !strcmp(ext_type, "ext4dev")) { - printf(_("You probably need to install an updated " - "mke2fs.conf file.\n\n")); + printf("%s", _("You probably need to install an " + "updated mke2fs.conf file.\n\n")); } if (!force) { - printf(_("Aborting...\n")); + printf("%s", _("Aborting...\n")); exit(1); } } - meg = (1024 * 1024) / EXT2_BLOCK_SIZE(fs_param); - if (fs_param->s_blocks_count < 3 * meg) + meg = (1024 * 1024) / EXT2_BLOCK_SIZE(sb); + if (fs_blocks_count < 3 * meg) size_type = "floppy"; - else if (fs_param->s_blocks_count < 512 * meg) + else if (fs_blocks_count < 512 * meg) size_type = "small"; - else + else if (fs_blocks_count < 4 * 1024 * 1024 * meg) size_type = "default"; + else if (fs_blocks_count < 16 * 1024 * 1024 * meg) + size_type = "big"; + else + size_type = "huge"; if (!usage_types) usage_types = size_type; - parse_str = malloc(usage_types ? strlen(usage_types)+1 : 1); + parse_str = malloc(strlen(usage_types)+1); if (!parse_str) { + free(profile_type); free(list.list); return 0; } - if (usage_types) - strcpy(parse_str, usage_types); - else - *parse_str = '\0'; + strcpy(parse_str, usage_types); if (ext_type) push_string(&list, ext_type); @@ -1092,10 +1234,8 @@ static char **parse_fs_type(const char *fs_type, } if (t) cp = t+1; - else { - cp = ""; + else break; - } } free(parse_str); free(profile_type); @@ -1104,15 +1244,15 @@ static char **parse_fs_type(const char *fs_type, return (list.list); } -static char *get_string_from_profile(char **fs_types, const char *opt, +char *get_string_from_profile(char **types, const char *opt, const char *def_val) { char *ret = 0; int i; - for (i=0; fs_types[i]; i++); + for (i=0; types[i]; i++); for (i-=1; i >=0 ; i--) { - profile_get_string(profile, "fs_types", fs_types[i], + profile_get_string(profile, "fs_types", types[i], opt, 0, &ret); if (ret) return ret; @@ -1121,24 +1261,48 @@ static char *get_string_from_profile(char **fs_types, const char *opt, return (ret); } -static int get_int_from_profile(char **fs_types, const char *opt, int def_val) +int get_int_from_profile(char **types, const char *opt, int def_val) { int ret; char **cpp; profile_get_integer(profile, "defaults", opt, 0, def_val, &ret); - for (cpp = fs_types; *cpp; cpp++) + for (cpp = types; *cpp; cpp++) profile_get_integer(profile, "fs_types", *cpp, opt, ret, &ret); return ret; } -static int get_bool_from_profile(char **fs_types, const char *opt, int def_val) +static unsigned int get_uint_from_profile(char **types, const char *opt, + unsigned int def_val) +{ + unsigned int ret; + char **cpp; + + profile_get_uint(profile, "defaults", opt, 0, def_val, &ret); + for (cpp = types; *cpp; cpp++) + profile_get_uint(profile, "fs_types", *cpp, opt, ret, &ret); + return ret; +} + +static double get_double_from_profile(char **types, const char *opt, + double def_val) +{ + double ret; + char **cpp; + + profile_get_double(profile, "defaults", opt, 0, def_val, &ret); + for (cpp = types; *cpp; cpp++) + profile_get_double(profile, "fs_types", *cpp, opt, ret, &ret); + return ret; +} + +int get_bool_from_profile(char **types, const char *opt, int def_val) { int ret; char **cpp; profile_get_boolean(profile, "defaults", opt, 0, def_val, &ret); - for (cpp = fs_types; *cpp; cpp++) + for (cpp = types; *cpp; cpp++) profile_get_boolean(profile, "fs_types", *cpp, opt, ret, &ret); return ret; } @@ -1200,26 +1364,38 @@ out: static void PRS(int argc, char *argv[]) { - int b, c; - int size; + int b, c, flags; + int cluster_size = 0; char *tmp, **cpp; int blocksize = 0; int inode_ratio = 0; int inode_size = 0; unsigned long flex_bg_size = 0; - double reserved_ratio = 5.0; + double reserved_ratio = -1.0; int lsector_size = 0, psector_size = 0; - int show_version_only = 0; + int show_version_only = 0, is_device = 0; unsigned long long num_inodes = 0; /* unsigned long long to catch too-large input */ errcode_t retval; char * oldpath = getenv("PATH"); char * extended_opts = 0; - const char * fs_type = 0; - const char * usage_types = 0; - blk_t dev_size; -#ifdef __linux__ - struct utsname ut; -#endif + char * fs_type = 0; + char * usage_types = 0; + /* + * NOTE: A few words about fs_blocks_count and blocksize: + * + * Initially, blocksize is set to zero, which implies 1024. + * If -b is specified, blocksize is updated to the user's value. + * + * Next, the device size or the user's "blocks" command line argument + * is used to set fs_blocks_count; the units are blocksize. + * + * Later, if blocksize hasn't been set and the profile specifies a + * blocksize, then blocksize is updated and fs_blocks_count is scaled + * appropriately. Note the change in units! + * + * Finally, we complain about fs_blocks_count > 2^32 on a non-64bit fs. + */ + blk64_t fs_blocks_count = 0; long sysval; int s_opt = -1, r_opt = -1; char *fs_features = 0; @@ -1230,6 +1406,11 @@ static void PRS(int argc, char *argv[]) if (oldpath) pathlen += strlen(oldpath); newpath = malloc(pathlen); + if (!newpath) { + fprintf(stderr, "%s", + _("Couldn't allocate memory for new PATH.\n")); + exit(1); + } strcpy(newpath, PATH_SET); /* Update our PATH to include /sbin */ @@ -1260,8 +1441,17 @@ static void PRS(int argc, char *argv[]) profile_set_syntax_err_cb(syntax_err_report); retval = profile_init(config_fn, &profile); if (retval == ENOENT) { - profile_init(default_files, &profile); - profile_set_default(profile, mke2fs_default_profile); + retval = profile_init(default_files, &profile); + if (retval) + goto profile_error; + retval = profile_set_default(profile, mke2fs_default_profile); + if (retval) + goto profile_error; + } else if (retval) { +profile_error: + fprintf(stderr, _("Couldn't init profile successfully" + " (error: %ld).\n"), retval); + exit(1); } setbuf(stdout, NULL); @@ -1271,15 +1461,8 @@ static void PRS(int argc, char *argv[]) memset(&fs_param, 0, sizeof(struct ext2_super_block)); fs_param.s_rev_level = 1; /* Create revision 1 filesystems now */ -#ifdef __linux__ - if (uname(&ut)) { - perror("uname"); - exit(1); - } - linux_version_code = parse_version_number(ut.release); - if (linux_version_code && linux_version_code < (2*65536 + 2*256)) + if (ext2fs_is_before_linux_ver(2, 2, 0)) fs_param.s_rev_level = 0; -#endif if (argc && *argv) { program_name = get_progname(*argv); @@ -1291,13 +1474,13 @@ static void PRS(int argc, char *argv[]) } while ((c = getopt (argc, argv, - "b:cf:g:G:i:jl:m:no:qr:s:t:vE:FI:J:KL:M:N:O:R:ST:U:V")) != EOF) { + "b:cg:i:jl:m:no:qr:s:t:vC:DE:FG:I:J:KL:M:N:O:R:ST:U:V")) != EOF) { switch (c) { case 'b': - blocksize = strtol(optarg, &tmp, 0); + blocksize = parse_num_blocks2(optarg, -1); b = (blocksize > 0) ? blocksize : -blocksize; if (b < EXT2_MIN_BLOCK_SIZE || - b > EXT2_MAX_BLOCK_SIZE || *tmp) { + b > EXT2_MAX_BLOCK_SIZE) { com_err(program_name, 0, _("invalid block size - %s"), optarg); exit(1); @@ -1314,27 +1497,38 @@ static void PRS(int argc, char *argv[]) case 'c': /* Check for bad blocks */ cflag++; break; - case 'f': - size = strtoul(optarg, &tmp, 0); - if (size < EXT2_MIN_BLOCK_SIZE || - size > EXT2_MAX_BLOCK_SIZE || *tmp) { + case 'C': + cluster_size = parse_num_blocks2(optarg, -1); + if (cluster_size <= EXT2_MIN_CLUSTER_SIZE || + cluster_size > EXT2_MAX_CLUSTER_SIZE) { com_err(program_name, 0, - _("invalid fragment size - %s"), + _("invalid cluster size - %s"), optarg); exit(1); } - fprintf(stderr, _("Warning: fragments not supported. " - "Ignoring -f option\n")); + break; + case 'D': + direct_io = 1; + break; + case 'R': + com_err(program_name, 0, "%s", + _("'-R' is deprecated, use '-E' instead")); + /* fallthrough */ + case 'E': + extended_opts = optarg; + break; + case 'F': + force++; break; case 'g': fs_param.s_blocks_per_group = strtoul(optarg, &tmp, 0); if (*tmp) { - com_err(program_name, 0, - _("Illegal number for blocks per group")); + com_err(program_name, 0, "%s", + _("Illegal number for blocks per group")); exit(1); } if ((fs_param.s_blocks_per_group % 8) != 0) { - com_err(program_name, 0, + com_err(program_name, 0, "%s", _("blocks per group must be multiple of 8")); exit(1); } @@ -1342,16 +1536,22 @@ static void PRS(int argc, char *argv[]) case 'G': flex_bg_size = strtoul(optarg, &tmp, 0); if (*tmp) { - com_err(program_name, 0, + com_err(program_name, 0, "%s", _("Illegal number for flex_bg size")); exit(1); } if (flex_bg_size < 1 || (flex_bg_size & (flex_bg_size-1)) != 0) { - com_err(program_name, 0, + com_err(program_name, 0, "%s", _("flex_bg size must be a power of 2")); exit(1); } + if (flex_bg_size > MAX_32_NUM) { + com_err(program_name, 0, + _("flex_bg size (%lu) must be less than" + " or equal to 2^31"), flex_bg_size); + exit(1); + } break; case 'i': inode_ratio = strtoul(optarg, &tmp, 0); @@ -1365,29 +1565,42 @@ static void PRS(int argc, char *argv[]) exit(1); } break; + case 'I': + inode_size = strtoul(optarg, &tmp, 0); + if (*tmp) { + com_err(program_name, 0, + _("invalid inode size - %s"), optarg); + exit(1); + } + break; + case 'j': + if (!journal_size) + journal_size = -1; + break; case 'J': parse_journal_opts(optarg); break; case 'K': - fprintf(stderr, _("Warning: -K option is deprecated and " - "should not be used anymore. Use " - "\'-E nodiscard\' extended option " - "instead!\n")); + fprintf(stderr, "%s", + _("Warning: -K option is deprecated and " + "should not be used anymore. Use " + "\'-E nodiscard\' extended option " + "instead!\n")); discard = 0; break; - case 'j': - if (!journal_size) - journal_size = -1; - break; case 'l': - bad_blocks_filename = malloc(strlen(optarg)+1); + bad_blocks_filename = realloc(bad_blocks_filename, + strlen(optarg) + 1); if (!bad_blocks_filename) { - com_err(program_name, ENOMEM, + com_err(program_name, ENOMEM, "%s", _("in malloc for bad_blocks_filename")); exit(1); } strcpy(bad_blocks_filename, optarg); break; + case 'L': + volume_label = optarg; + break; case 'm': reserved_ratio = strtod(optarg, &tmp); if ( *tmp || reserved_ratio > 50 || @@ -1398,12 +1611,26 @@ static void PRS(int argc, char *argv[]) exit(1); } break; + case 'M': + mount_dir = optarg; + break; case 'n': noaction++; break; + case 'N': + num_inodes = strtoul(optarg, &tmp, 0); + if (*tmp) { + com_err(program_name, 0, + _("bad num inodes - %s"), optarg); + exit(1); + } + break; case 'o': creator_os = optarg; break; + case 'O': + fs_features = optarg; + break; case 'q': quiet = 1; break; @@ -1414,58 +1641,41 @@ static void PRS(int argc, char *argv[]) _("bad revision level - %s"), optarg); exit(1); } + if (r_opt > EXT2_MAX_SUPP_REV) { + com_err(program_name, EXT2_ET_REV_TOO_HIGH, + _("while trying to create revision %d"), r_opt); + exit(1); + } fs_param.s_rev_level = r_opt; break; case 's': /* deprecated */ s_opt = atoi(optarg); break; - case 'I': - inode_size = strtoul(optarg, &tmp, 0); - if (*tmp) { - com_err(program_name, 0, - _("invalid inode size - %s"), optarg); - exit(1); - } - break; - case 'v': - verbose = 1; - break; - case 'F': - force++; - break; - case 'L': - volume_label = optarg; - break; - case 'M': - mount_dir = optarg; - break; - case 'N': - num_inodes = strtoul(optarg, &tmp, 0); - if (*tmp) { - com_err(program_name, 0, - _("bad num inodes - %s"), optarg); - exit(1); - } - break; - case 'O': - fs_features = optarg; - break; - case 'E': - case 'R': - extended_opts = optarg; - break; case 'S': super_only = 1; break; case 't': - fs_type = optarg; + if (fs_type) { + com_err(program_name, 0, "%s", + _("The -t option may only be used once")); + exit(1); + } + fs_type = strdup(optarg); break; case 'T': - usage_types = optarg; + if (usage_types) { + com_err(program_name, 0, "%s", + _("The -T option may only be used once")); + exit(1); + } + usage_types = strdup(optarg); break; case 'U': fs_uuid = optarg; break; + case 'v': + verbose = 1; + break; case 'V': /* Print version number and exit */ show_version_only++; @@ -1523,26 +1733,15 @@ static void PRS(int argc, char *argv[]) printf(_("Using journal device's blocksize: %d\n"), blocksize); fs_param.s_log_block_size = int_log2(blocksize >> EXT2_MIN_BLOCK_LOG_SIZE); - ext2fs_close(jfs); + ext2fs_close_free(&jfs); } - if (blocksize > sys_page_size) { - if (!force) { - com_err(program_name, 0, - _("%d-byte blocks too big for system (max %d)"), - blocksize, sys_page_size); - proceed_question(); - } - fprintf(stderr, _("Warning: %d-byte blocks too big for system " - "(max %d), forced to continue\n"), - blocksize, sys_page_size); - } if (optind < argc) { - fs_param.s_blocks_count = parse_num_blocks(argv[optind++], - fs_param.s_log_block_size); - if (!fs_param.s_blocks_count) { + fs_blocks_count = parse_num_blocks2(argv[optind++], + fs_param.s_log_block_size); + if (!fs_blocks_count) { com_err(program_name, 0, - _("invalid blocks count '%s' on device '%s'"), + _("invalid blocks '%s' on device '%s'"), argv[optind - 1], device_name); exit(1); } @@ -1550,67 +1749,46 @@ static void PRS(int argc, char *argv[]) if (optind < argc) usage(); - if (!force) - check_plausibility(device_name); - check_mount(device_name, force, _("filesystem")); + profile_get_integer(profile, "options", "proceed_delay", 0, 0, + &proceed_delay); - fs_param.s_log_cluster_size = fs_param.s_log_block_size; - - if (noaction && fs_param.s_blocks_count) { - dev_size = fs_param.s_blocks_count; - retval = 0; - } else { - retry: - retval = ext2fs_get_device_size(device_name, - EXT2_BLOCK_SIZE(&fs_param), - &dev_size); - if ((retval == EFBIG) && - (blocksize == 0) && - (fs_param.s_log_block_size == 0)) { - fs_param.s_log_block_size = 2; - blocksize = 4096; - goto retry; - } - } + /* The isatty() test is so we don't break existing scripts */ + flags = CREATE_FILE; + if (isatty(0) && isatty(1)) + flags |= CHECK_FS_EXIST; + if (!quiet) + flags |= VERBOSE_CREATE; + if (fs_blocks_count == 0) + flags |= NO_SIZE; + if (!check_plausibility(device_name, flags, &is_device) && !force) + proceed_question(proceed_delay); - if (retval == EFBIG) { - blk64_t big_dev_size; + check_mount(device_name, force, _("filesystem")); - if (blocksize < 4096) { - fs_param.s_log_block_size = 2; - blocksize = 4096; - } + /* Determine the size of the device (if possible) */ + if (noaction && fs_blocks_count) { + dev_size = fs_blocks_count; + retval = 0; + } else retval = ext2fs_get_device_size2(device_name, - EXT2_BLOCK_SIZE(&fs_param), &big_dev_size); - if (retval) - goto get_size_failure; - if (big_dev_size == (1ULL << 32)) { - dev_size = (blk_t) (big_dev_size - 1); - goto got_size; - } - fprintf(stderr, _("%s: Size of device %s too big " - "to be expressed in 32 bits\n\t" - "using a blocksize of %d.\n"), - program_name, device_name, EXT2_BLOCK_SIZE(&fs_param)); - exit(1); - } -get_size_failure: + EXT2_BLOCK_SIZE(&fs_param), + &dev_size); + if (retval && (retval != EXT2_ET_UNIMPLEMENTED)) { - com_err(program_name, retval, + com_err(program_name, retval, "%s", _("while trying to determine filesystem size")); exit(1); } -got_size: - if (!fs_param.s_blocks_count) { + if (!fs_blocks_count) { if (retval == EXT2_ET_UNIMPLEMENTED) { - com_err(program_name, 0, + com_err(program_name, 0, "%s", _("Couldn't determine device size; you " "must specify\nthe size of the " "filesystem\n")); exit(1); } else { if (dev_size == 0) { - com_err(program_name, 0, + com_err(program_name, 0, "%s", _("Device size reported to be zero. " "Invalid partition specified, or\n\t" "partition table wasn't reread " @@ -1621,21 +1799,34 @@ got_size: )); exit(1); } - fs_param.s_blocks_count = dev_size; + fs_blocks_count = dev_size; if (sys_page_size > EXT2_BLOCK_SIZE(&fs_param)) - fs_param.s_blocks_count &= ~((sys_page_size / - EXT2_BLOCK_SIZE(&fs_param))-1); + fs_blocks_count &= ~((blk64_t) ((sys_page_size / + EXT2_BLOCK_SIZE(&fs_param))-1)); } - - } else if (!force && (fs_param.s_blocks_count > dev_size)) { - com_err(program_name, 0, + } else if (!force && is_device && (fs_blocks_count > dev_size)) { + com_err(program_name, 0, "%s", _("Filesystem larger than apparent device size.")); - proceed_question(); + proceed_question(proceed_delay); } - fs_types = parse_fs_type(fs_type, usage_types, &fs_param, argv[0]); + if (!fs_type) + profile_get_string(profile, "devices", device_name, + "fs_type", 0, &fs_type); + if (!usage_types) + profile_get_string(profile, "devices", device_name, + "usage_types", 0, &usage_types); + + /* + * We have the file system (or device) size, so we can now + * determine the appropriate file system types so the fs can + * be appropriately configured. + */ + fs_types = parse_fs_type(fs_type, usage_types, &fs_param, + fs_blocks_count ? fs_blocks_count : dev_size, + argv[0]); if (!fs_types) { - fprintf(stderr, _("Failed to parse fs types list\n")); + fprintf(stderr, "%s", _("Failed to parse fs types list\n")); exit(1); } @@ -1644,7 +1835,7 @@ got_size: tmp = NULL; if (fs_param.s_rev_level != EXT2_GOOD_OLD_REV) { tmp = get_string_from_profile(fs_types, "base_features", - "sparse_super,filetype,resize_inode,dir_index"); + "sparse_super,large_file,filetype,resize_inode,dir_index"); edit_feature(tmp, &fs_param.s_feature_compat); free(tmp); @@ -1661,14 +1852,98 @@ got_size: "features", "", &tmp); if (tmp && *tmp) edit_feature(tmp, &fs_param.s_feature_compat); - free(tmp); + if (tmp) + free(tmp); } tmp = get_string_from_profile(fs_types, "default_features", ""); } edit_feature(fs_features ? fs_features : tmp, &fs_param.s_feature_compat); - free(tmp); + if (tmp) + free(tmp); + + /* Get the hardware sector sizes, if available */ + retval = ext2fs_get_device_sectsize(device_name, &lsector_size); + if (retval) { + com_err(program_name, retval, "%s", + _("while trying to determine hardware sector size")); + exit(1); + } + retval = ext2fs_get_device_phys_sectsize(device_name, &psector_size); + if (retval) { + com_err(program_name, retval, "%s", + _("while trying to determine physical sector size")); + exit(1); + } + + tmp = getenv("MKE2FS_DEVICE_SECTSIZE"); + if (tmp != NULL) + lsector_size = atoi(tmp); + tmp = getenv("MKE2FS_DEVICE_PHYS_SECTSIZE"); + if (tmp != NULL) + psector_size = atoi(tmp); + + /* Older kernels may not have physical/logical distinction */ + if (!psector_size) + psector_size = lsector_size; + + if (blocksize <= 0) { + use_bsize = get_int_from_profile(fs_types, "blocksize", 4096); + + if (use_bsize == -1) { + use_bsize = sys_page_size; + if (ext2fs_is_before_linux_ver(2, 6, 0) && + use_bsize > 4096) + use_bsize = 4096; + } + if (lsector_size && use_bsize < lsector_size) + use_bsize = lsector_size; + if ((blocksize < 0) && (use_bsize < (-blocksize))) + use_bsize = -blocksize; + blocksize = use_bsize; + fs_blocks_count /= (blocksize / 1024); + } else { + if (blocksize < lsector_size) { /* Impossible */ + com_err(program_name, EINVAL, "%s", + _("while setting blocksize; too small " + "for device\n")); + exit(1); + } else if ((blocksize < psector_size) && + (psector_size <= sys_page_size)) { /* Suboptimal */ + fprintf(stderr, _("Warning: specified blocksize %d is " + "less than device physical sectorsize %d\n"), + blocksize, psector_size); + } + } + + fs_param.s_log_block_size = + int_log2(blocksize >> EXT2_MIN_BLOCK_LOG_SIZE); + + /* + * We now need to do a sanity check of fs_blocks_count for + * 32-bit vs 64-bit block number support. + */ + if ((fs_blocks_count > MAX_32_NUM) && + (fs_param.s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)) + fs_param.s_feature_compat &= ~EXT2_FEATURE_COMPAT_RESIZE_INODE; + if ((fs_blocks_count > MAX_32_NUM) && + !(fs_param.s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) && + get_bool_from_profile(fs_types, "auto_64-bit_support", 0)) { + fs_param.s_feature_incompat |= EXT4_FEATURE_INCOMPAT_64BIT; + fs_param.s_feature_compat &= ~EXT2_FEATURE_COMPAT_RESIZE_INODE; + } + if ((fs_blocks_count > MAX_32_NUM) && + !(fs_param.s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)) { + fprintf(stderr, _("%s: Size of device (0x%llx blocks) %s " + "too big to be expressed\n\t" + "in 32 bits using a blocksize of %d.\n"), + program_name, fs_blocks_count, device_name, + EXT2_BLOCK_SIZE(&fs_param)); + exit(1); + } + + ext2fs_blocks_count_set(&fs_param, fs_blocks_count); if (fs_param.s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) { fs_types[0] = strdup("journal"); @@ -1683,14 +1958,15 @@ got_size: if (r_opt == EXT2_GOOD_OLD_REV && (fs_param.s_feature_compat || fs_param.s_feature_incompat || fs_param.s_feature_ro_compat)) { - fprintf(stderr, _("Filesystem features not supported " - "with revision 0 filesystems\n")); + fprintf(stderr, "%s", _("Filesystem features not supported " + "with revision 0 filesystems\n")); exit(1); } if (s_opt > 0) { if (r_opt == EXT2_GOOD_OLD_REV) { - fprintf(stderr, _("Sparse superblocks not supported " + fprintf(stderr, "%s", + _("Sparse superblocks not supported " "with revision 0 filesystems\n")); exit(1); } @@ -1702,14 +1978,26 @@ got_size: if (journal_size != 0) { if (r_opt == EXT2_GOOD_OLD_REV) { - fprintf(stderr, _("Journals not supported " - "with revision 0 filesystems\n")); + fprintf(stderr, "%s", _("Journals not supported with " + "revision 0 filesystems\n")); exit(1); } fs_param.s_feature_compat |= EXT3_FEATURE_COMPAT_HAS_JOURNAL; } + /* Get reserved_ratio from profile if not specified on cmd line. */ + if (reserved_ratio < 0.0) { + reserved_ratio = get_double_from_profile( + fs_types, "reserved_ratio", 5.0); + if (reserved_ratio > 50 || reserved_ratio < 0) { + com_err(program_name, 0, + _("invalid reserved blocks percent - %lf"), + reserved_ratio); + exit(1); + } + } + if (fs_param.s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) { reserved_ratio = 0; @@ -1718,12 +2006,11 @@ got_size: fs_param.s_feature_ro_compat = 0; } - if ((fs_param.s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) && - (fs_param.s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE)) { - fprintf(stderr, _("The resize_inode and meta_bg features " - "are not compatible.\n" - "They can not be both enabled " - "simultaneously.\n")); + /* Check the user's mkfs options for 64bit */ + if ((fs_param.s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) && + !(fs_param.s_feature_incompat & EXT3_FEATURE_INCOMPAT_EXTENTS)) { + printf("%s", _("Extents MUST be enabled for a 64-bit " + "filesystem. Pass -O extents to rectify.\n")); exit(1); } @@ -1732,69 +2019,37 @@ got_size: if ((fs_param.s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) && ((tmp = getenv("MKE2FS_FIRST_META_BG")))) fs_param.s_first_meta_bg = atoi(tmp); - - /* Get the hardware sector sizes, if available */ - retval = ext2fs_get_device_sectsize(device_name, &lsector_size); - if (retval) { - com_err(program_name, retval, - _("while trying to determine hardware sector size")); - exit(1); - } - retval = ext2fs_get_device_phys_sectsize(device_name, &psector_size); - if (retval) { - com_err(program_name, retval, - _("while trying to determine physical sector size")); - exit(1); - } - - if ((tmp = getenv("MKE2FS_DEVICE_SECTSIZE")) != NULL) - lsector_size = atoi(tmp); - if ((tmp = getenv("MKE2FS_DEVICE_PHYS_SECTSIZE")) != NULL) - psector_size = atoi(tmp); - - /* Older kernels may not have physical/logical distinction */ - if (!psector_size) - psector_size = lsector_size; - - if (blocksize <= 0) { - use_bsize = get_int_from_profile(fs_types, "blocksize", 4096); - - if (use_bsize == -1) { - use_bsize = sys_page_size; - if ((linux_version_code < (2*65536 + 6*256)) && - (use_bsize > 4096)) - use_bsize = 4096; - } - if (lsector_size && use_bsize < lsector_size) - use_bsize = lsector_size; - if ((blocksize < 0) && (use_bsize < (-blocksize))) - use_bsize = -blocksize; - blocksize = use_bsize; - fs_param.s_blocks_count /= blocksize / 1024; - } else { - if (blocksize < lsector_size) { /* Impossible */ - com_err(program_name, EINVAL, - _("while setting blocksize; too small " - "for device\n")); + if (fs_param.s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_BIGALLOC) { + if (!cluster_size) + cluster_size = get_int_from_profile(fs_types, + "cluster_size", + blocksize*16); + fs_param.s_log_cluster_size = + int_log2(cluster_size >> EXT2_MIN_CLUSTER_LOG_SIZE); + if (fs_param.s_log_cluster_size && + fs_param.s_log_cluster_size < fs_param.s_log_block_size) { + com_err(program_name, 0, "%s", + _("The cluster size may not be " + "smaller than the block size.\n")); exit(1); - } else if ((blocksize < psector_size) && - (psector_size <= sys_page_size)) { /* Suboptimal */ - fprintf(stderr, _("Warning: specified blocksize %d is " - "less than device physical sectorsize %d\n"), - blocksize, psector_size); } - } + } else if (cluster_size) { + com_err(program_name, 0, "%s", + _("specifying a cluster size requires the " + "bigalloc feature")); + exit(1); + } else + fs_param.s_log_cluster_size = fs_param.s_log_block_size; if (inode_ratio == 0) { inode_ratio = get_int_from_profile(fs_types, "inode_ratio", 8192); if (inode_ratio < blocksize) inode_ratio = blocksize; + if (inode_ratio < EXT2_CLUSTER_SIZE(&fs_param)) + inode_ratio = EXT2_CLUSTER_SIZE(&fs_param); } - fs_param.s_log_cluster_size = fs_param.s_log_block_size = - int_log2(blocksize >> EXT2_MIN_BLOCK_LOG_SIZE); - #ifdef HAVE_BLKID_PROBE_GET_TOPOLOGY retval = get_device_geometry(device_name, &fs_param, psector_size); if (retval < 0) { @@ -1809,9 +2064,40 @@ got_size: } #endif + num_backups = get_int_from_profile(fs_types, "num_backup_sb", 2); + blocksize = EXT2_BLOCK_SIZE(&fs_param); - lazy_itable_init = 0; + /* + * Initialize s_desc_size so that the parse_extended_opts() + * can correctly handle "-E resize=NNN" if the 64-bit option + * is set. + */ + if (fs_param.s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT) + fs_param.s_desc_size = EXT2_MIN_DESC_SIZE_64BIT; + + /* This check should happen beyond the last assignment to blocksize */ + if (blocksize > sys_page_size) { + if (!force) { + com_err(program_name, 0, + _("%d-byte blocks too big for system (max %d)"), + blocksize, sys_page_size); + proceed_question(proceed_delay); + } + fprintf(stderr, _("Warning: %d-byte blocks too big for system " + "(max %d), forced to continue\n"), + blocksize, sys_page_size); + } + + /* + * On newer kernels we do have lazy_itable_init support. So pick the + * right default in case ext4 module is not loaded. + */ + if (ext2fs_is_before_linux_ver(2, 6, 37)) + lazy_itable_init = 0; + else + lazy_itable_init = 1; + if (access("/sys/fs/ext4/features/lazy_itable_init", R_OK) == 0) lazy_itable_init = 1; @@ -1819,6 +2105,24 @@ got_size: "lazy_itable_init", lazy_itable_init); discard = get_bool_from_profile(fs_types, "discard" , discard); + journal_flags |= get_bool_from_profile(fs_types, + "lazy_journal_init", 0) ? + EXT2_MKJOURNAL_LAZYINIT : 0; + journal_flags |= EXT2_MKJOURNAL_NO_MNT_CHECK; + + if (!journal_location_string) + journal_location_string = get_string_from_profile(fs_types, + "journal_location", ""); + if ((journal_location == ~0ULL) && journal_location_string && + *journal_location_string) + journal_location = parse_num_blocks2(journal_location_string, + fs_param.s_log_block_size); + free(journal_location_string); + + packed_meta_blocks = get_bool_from_profile(fs_types, + "packed_meta_blocks", 0); + if (packed_meta_blocks) + journal_location = 0; /* Get options from profile */ for (cpp = fs_types; *cpp; cpp++) { @@ -1832,12 +2136,37 @@ got_size: if (extended_opts) parse_extended_opts(&fs_param, extended_opts); + /* Can't support bigalloc feature without extents feature */ + if ((fs_param.s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_BIGALLOC) && + !(fs_param.s_feature_incompat & EXT3_FEATURE_INCOMPAT_EXTENTS)) { + com_err(program_name, 0, "%s", + _("Can't support bigalloc feature without " + "extents feature")); + exit(1); + } + + if ((fs_param.s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) && + (fs_param.s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE)) { + fprintf(stderr, "%s", _("The resize_inode and meta_bg " + "features are not compatible.\n" + "They can not be both enabled " + "simultaneously.\n")); + exit(1); + } + + if (!quiet && + (fs_param.s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_BIGALLOC)) + fprintf(stderr, "%s", _("\nWarning: the bigalloc feature is " + "still under development\n" + "See https://ext4.wiki.kernel.org/" + "index.php/Bigalloc for more information\n\n")); + /* Since sparse_super is the default, we would only have a problem * here if it was explicitly disabled. */ if ((fs_param.s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE) && !(fs_param.s_feature_ro_compat&EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)) { - com_err(program_name, 0, + com_err(program_name, 0, "%s", _("reserved online resize blocks not supported " "on non-sparse filesystem")); exit(1); @@ -1846,22 +2175,31 @@ got_size: if (fs_param.s_blocks_per_group) { if (fs_param.s_blocks_per_group < 256 || fs_param.s_blocks_per_group > 8 * (unsigned) blocksize) { - com_err(program_name, 0, + com_err(program_name, 0, "%s", _("blocks per group count out of range")); exit(1); } } + /* + * If the bigalloc feature is enabled, then the -g option will + * specify the number of clusters per group. + */ + if (fs_param.s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_BIGALLOC) { + fs_param.s_clusters_per_group = fs_param.s_blocks_per_group; + fs_param.s_blocks_per_group = 0; + } + if (inode_size == 0) inode_size = get_int_from_profile(fs_types, "inode_size", 0); if (!flex_bg_size && (fs_param.s_feature_incompat & EXT4_FEATURE_INCOMPAT_FLEX_BG)) - flex_bg_size = get_int_from_profile(fs_types, - "flex_bg_size", 16); + flex_bg_size = get_uint_from_profile(fs_types, + "flex_bg_size", 16); if (flex_bg_size) { if (!(fs_param.s_feature_incompat & EXT4_FEATURE_INCOMPAT_FLEX_BG)) { - com_err(program_name, 0, + com_err(program_name, 0, "%s", _("Flex_bg feature not enabled, so " "flex_bg size may not be specified")); exit(1); @@ -1885,13 +2223,19 @@ got_size: /* Make sure number of inodes specified will fit in 32 bits */ if (num_inodes == 0) { unsigned long long n; - n = (unsigned long long) fs_param.s_blocks_count * blocksize / inode_ratio; - if (n > ~0U) { - com_err(program_name, 0, - _("too many inodes (%llu), raise inode ratio?"), n); - exit(1); + n = ext2fs_blocks_count(&fs_param) * blocksize / inode_ratio; + if (n > MAX_32_NUM) { + if (fs_param.s_feature_incompat & + EXT4_FEATURE_INCOMPAT_64BIT) + num_inodes = MAX_32_NUM; + else { + com_err(program_name, 0, + _("too many inodes (%llu), raise " + "inode ratio?"), n); + exit(1); + } } - } else if (num_inodes > ~0U) { + } else if (num_inodes > MAX_32_NUM) { com_err(program_name, 0, _("too many inodes (%llu), specify < 2^32 inodes"), num_inodes); @@ -1901,29 +2245,38 @@ got_size: * Calculate number of inodes based on the inode ratio */ fs_param.s_inodes_count = num_inodes ? num_inodes : - ((__u64) fs_param.s_blocks_count * blocksize) - / inode_ratio; + (ext2fs_blocks_count(&fs_param) * blocksize) / inode_ratio; - if ((((long long)fs_param.s_inodes_count) * + if ((((unsigned long long)fs_param.s_inodes_count) * (inode_size ? inode_size : EXT2_GOOD_OLD_INODE_SIZE)) >= - (((long long)fs_param.s_blocks_count) * + ((ext2fs_blocks_count(&fs_param)) * EXT2_BLOCK_SIZE(&fs_param))) { com_err(program_name, 0, _("inode_size (%u) * inodes_count " "(%u) too big for a\n\t" - "filesystem with %lu blocks, " + "filesystem with %llu blocks, " "specify higher inode_ratio (-i)\n\t" "or lower inode count (-N).\n"), inode_size ? inode_size : EXT2_GOOD_OLD_INODE_SIZE, fs_param.s_inodes_count, - (unsigned long) fs_param.s_blocks_count); + (unsigned long long) ext2fs_blocks_count(&fs_param)); exit(1); } /* * Calculate number of blocks to reserve */ - fs_param.s_r_blocks_count = (unsigned int) (reserved_ratio * - fs_param.s_blocks_count / 100.0); + ext2fs_r_blocks_count_set(&fs_param, reserved_ratio * + ext2fs_blocks_count(&fs_param) / 100.0); + + if (fs_param.s_feature_compat & EXT4_FEATURE_COMPAT_SPARSE_SUPER2) { + if (num_backups >= 1) + fs_param.s_backup_bgs[0] = 1; + if (num_backups >= 2) + fs_param.s_backup_bgs[1] = ~0; + } + + free(fs_type); + free(usage_types); } static int should_do_undo(const char *name) @@ -1954,7 +2307,7 @@ static int should_do_undo(const char *name) } io_channel_set_blksize(channel, SUPERBLOCK_OFFSET); - retval = io_channel_read_blk(channel, 1, -SUPERBLOCK_SIZE, &super); + retval = io_channel_read_blk64(channel, 1, -SUPERBLOCK_SIZE, &super); if (retval) { retval = 0; goto err_out; @@ -1979,133 +2332,184 @@ open_err_out: static int mke2fs_setup_tdb(const char *name, io_manager *io_ptr) { - errcode_t retval = 0; - char *tdb_dir, *tdb_file; - char *device_name, *tmp_name; + errcode_t retval = ENOMEM; + char *tdb_dir = NULL, *tdb_file = NULL; + char *dev_name, *tmp_name; + int free_tdb_dir = 0; /* * Configuration via a conf file would be * nice */ tdb_dir = getenv("E2FSPROGS_UNDO_DIR"); - if (!tdb_dir) + if (!tdb_dir) { profile_get_string(profile, "defaults", "undo_dir", 0, "/var/lib/e2fsprogs", &tdb_dir); + free_tdb_dir = 1; + } if (!strcmp(tdb_dir, "none") || (tdb_dir[0] == 0) || - access(tdb_dir, W_OK)) + access(tdb_dir, W_OK)) { + if (free_tdb_dir) + free(tdb_dir); return 0; + } tmp_name = strdup(name); - if (!tmp_name) { - alloc_fn_fail: - com_err(program_name, ENOMEM, - _("Couldn't allocate memory for tdb filename\n")); - return ENOMEM; - } - device_name = basename(tmp_name); - tdb_file = malloc(strlen(tdb_dir) + 8 + strlen(device_name) + 7 + 1); - if (!tdb_file) - goto alloc_fn_fail; - sprintf(tdb_file, "%s/mke2fs-%s.e2undo", tdb_dir, device_name); + if (!tmp_name) + goto errout; + dev_name = basename(tmp_name); + tdb_file = malloc(strlen(tdb_dir) + 8 + strlen(dev_name) + 7 + 1); + if (!tdb_file) { + free(tmp_name); + goto errout; + } + sprintf(tdb_file, "%s/mke2fs-%s.e2undo", tdb_dir, dev_name); + free(tmp_name); - if (!access(tdb_file, F_OK)) { - if (unlink(tdb_file) < 0) { - retval = errno; - com_err(program_name, retval, - _("while trying to delete %s"), - tdb_file); - free(tdb_file); - return retval; - } + if ((unlink(tdb_file) < 0) && (errno != ENOENT)) { + retval = errno; + goto errout; } set_undo_io_backing_manager(*io_ptr); *io_ptr = undo_io_manager; - set_undo_io_backup_file(tdb_file); + retval = set_undo_io_backup_file(tdb_file); + if (retval) + goto errout; printf(_("Overwriting existing filesystem; this can be undone " "using the command:\n" " e2undo %s %s\n\n"), tdb_file, name); + if (free_tdb_dir) + free(tdb_dir); free(tdb_file); - free(tmp_name); + return 0; + +errout: + if (free_tdb_dir) + free(tdb_dir); + free(tdb_file); + com_err(program_name, retval, "%s", + _("while trying to setup undo file\n")); return retval; } -#ifdef __linux__ +static int mke2fs_discard_device(ext2_filsys fs) +{ + struct ext2fs_numeric_progress_struct progress; + blk64_t blocks = ext2fs_blocks_count(fs->super); + blk64_t count = DISCARD_STEP_MB; + blk64_t cur; + int retval = 0; -#ifndef BLKDISCARD -#define BLKDISCARD _IO(0x12,119) -#endif + /* + * Let's try if discard really works on the device, so + * we do not print numeric progress resulting in failure + * afterwards. + */ + retval = io_channel_discard(fs->io, 0, fs->blocksize); + if (retval) + return retval; + cur = fs->blocksize; -#ifndef BLKDISCARDZEROES -#define BLKDISCARDZEROES _IO(0x12,124) -#endif + count *= (1024 * 1024); + count /= fs->blocksize; -/* - * Return zero if the discard succeeds, and -1 if the discard fails. - */ -static int mke2fs_discard_blocks(ext2_filsys fs) + ext2fs_numeric_progress_init(fs, &progress, + _("Discarding device blocks: "), + blocks); + while (cur < blocks) { + ext2fs_numeric_progress_update(fs, &progress, cur); + + if (cur + count > blocks) + count = blocks - cur; + + retval = io_channel_discard(fs->io, cur, count); + if (retval) + break; + cur += count; + } + + if (retval) { + ext2fs_numeric_progress_close(fs, &progress, + _("failed - ")); + if (!quiet) + printf("%s\n",error_message(retval)); + } else + ext2fs_numeric_progress_close(fs, &progress, + _("done \n")); + + return retval; +} + +static void fix_cluster_bg_counts(ext2_filsys fs) { - int fd; - int ret; - int blocksize; - __u64 blocks; - __uint64_t range[2]; - - blocks = fs->super->s_blocks_count; - blocksize = EXT2_BLOCK_SIZE(fs->super); - range[0] = 0; - range[1] = blocks * blocksize; - - fd = open64(fs->device_name, O_RDWR); - - if (fd > 0) { - ret = ioctl(fd, BLKDISCARD, &range); - if (verbose) { - printf(_("Calling BLKDISCARD from %llu to %llu "), - (unsigned long long) range[0], - (unsigned long long) range[1]); - if (ret) - printf(_("failed.\n")); - else - printf(_("succeeded.\n")); + blk64_t block, num_blocks, last_block, next; + blk64_t tot_free = 0; + errcode_t retval; + dgrp_t group = 0; + int grp_free = 0; + + num_blocks = ext2fs_blocks_count(fs->super); + last_block = ext2fs_group_last_block2(fs, group); + block = fs->super->s_first_data_block; + while (block < num_blocks) { + retval = ext2fs_find_first_zero_block_bitmap2(fs->block_map, + block, last_block, &next); + if (retval == 0) + block = next; + else { + block = last_block + 1; + goto next_bg; + } + + retval = ext2fs_find_first_set_block_bitmap2(fs->block_map, + block, last_block, &next); + if (retval) + next = last_block + 1; + grp_free += EXT2FS_NUM_B2C(fs, next - block); + tot_free += next - block; + block = next; + + if (block > last_block) { + next_bg: + ext2fs_bg_free_blocks_count_set(fs, group, grp_free); + ext2fs_group_desc_csum_set(fs, group); + grp_free = 0; + group++; + last_block = ext2fs_group_last_block2(fs, group); } - close(fd); } - return ret; + ext2fs_free_blocks_count_set(fs->super, tot_free); } -static int mke2fs_discard_zeroes_data(ext2_filsys fs) +static int create_quota_inodes(ext2_filsys fs) { - int fd; - int ret; - int discard_zeroes_data = 0; + quota_ctx_t qctx; - fd = open64(fs->device_name, O_RDWR); + quota_init_context(&qctx, fs, QUOTA_ALL_BIT); + quota_compute_usage(qctx); + quota_write_inode(qctx, quotatype_bits); + quota_release_context(&qctx); - if (fd > 0) { - ioctl(fd, BLKDISCARDZEROES, &discard_zeroes_data); - close(fd); - } - return discard_zeroes_data; + return 0; } -#else -#define mke2fs_discard_blocks(fs) 1 -#define mke2fs_discard_zeroes_data(fs) 0 -#endif int main (int argc, char *argv[]) { errcode_t retval = 0; ext2_filsys fs; badblocks_list bb_list = 0; - unsigned int journal_blocks; - unsigned int i; + unsigned int journal_blocks = 0; + unsigned int i, checkinterval; + int max_mnt_count; int val, hash_alg; + int flags; + int old_bitmaps; io_manager io_ptr; - char tdb_string[40]; + char opt_string[40]; char *hash_alg_str; int itable_zeroed = 0; @@ -2114,6 +2518,7 @@ int main (int argc, char *argv[]) setlocale(LC_CTYPE, ""); bindtextdomain(NLS_CAT_NAME, LOCALEDIR); textdomain(NLS_CAT_NAME); + set_com_err_gettext(gettext); #endif PRS(argc, argv); @@ -2134,29 +2539,54 @@ int main (int argc, char *argv[]) /* * Initialize the superblock.... */ - retval = ext2fs_initialize(device_name, EXT2_FLAG_EXCLUSIVE, &fs_param, - io_ptr, &fs); + flags = EXT2_FLAG_EXCLUSIVE; + if (direct_io) + flags |= EXT2_FLAG_DIRECT_IO; + profile_get_boolean(profile, "options", "old_bitmaps", 0, 0, + &old_bitmaps); + if (!old_bitmaps) + flags |= EXT2_FLAG_64BITS; + /* + * By default, we print how many inode tables or block groups + * or whatever we've written so far. The quiet flag disables + * this, along with a lot of other output. + */ + if (!quiet) + flags |= EXT2_FLAG_PRINT_PROGRESS; + retval = ext2fs_initialize(device_name, flags, &fs_param, io_ptr, &fs); if (retval) { - com_err(device_name, retval, _("while setting up superblock")); + com_err(device_name, retval, "%s", + _("while setting up superblock")); exit(1); } - /* Can't undo discard ... */ - if (!noaction && discard && (io_ptr != undo_io_manager)) { - retval = mke2fs_discard_blocks(fs); + /* Calculate journal blocks */ + if (!journal_device && ((journal_size) || + (fs_param.s_feature_compat & + EXT3_FEATURE_COMPAT_HAS_JOURNAL))) + journal_blocks = figure_journal_size(journal_size, fs); - if (!retval && mke2fs_discard_zeroes_data(fs)) { + /* Can't undo discard ... */ + if (!noaction && discard && dev_size && (io_ptr != undo_io_manager)) { + retval = mke2fs_discard_device(fs); + if (!retval && io_channel_discard_zeroes_data(fs->io)) { if (verbose) - printf(_("Discard succeeded and will return 0s " - " - skipping inode table wipe\n")); + printf("%s", + _("Discard succeeded and will return " + "0s - skipping inode table wipe\n")); lazy_itable_init = 1; itable_zeroed = 1; + zero_hugefile = 0; } } - sprintf(tdb_string, "tdb_data_size=%d", fs->blocksize <= 4096 ? + sprintf(opt_string, "tdb_data_size=%d", fs->blocksize <= 4096 ? 32768 : fs->blocksize * 8); - io_channel_set_options(fs->io, tdb_string); + io_channel_set_options(fs->io, opt_string); + if (offset) { + sprintf(opt_string, "offset=%llu", offset); + io_channel_set_options(fs->io, opt_string); + } if (fs_param.s_flags & EXT2_FLAGS_TEST_FILESYS) fs->super->s_flags |= EXT2_FLAGS_TEST_FILESYS; @@ -2223,7 +2653,8 @@ int main (int argc, char *argv[]) for (i = 0, val = 0 ; i < sizeof(fs->super->s_uuid); i++) val += fs->super->s_uuid[i]; fs->super->s_max_mnt_count += val % EXT2_DFL_MAX_MNT_COUNT; - } + } else + fs->super->s_max_mnt_count = -1; /* * Override the creator OS, if applicable @@ -2270,31 +2701,58 @@ int main (int argc, char *argv[]) if (fs->super->s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) { create_journal_dev(fs); - exit(ext2fs_close(fs) ? 1 : 0); + exit(ext2fs_close_free(&fs) ? 1 : 0); } if (bad_blocks_filename) read_bb_file(fs, &bb_list, bad_blocks_filename); if (cflag) test_disk(fs, &bb_list); - handle_bad_blocks(fs, bb_list); + fs->stride = fs_stride = fs->super->s_raid_stride; - retval = ext2fs_allocate_tables(fs); + if (!quiet) + printf("%s", _("Allocating group tables: ")); + if ((fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_FLEX_BG) && + packed_meta_blocks) + retval = packed_allocate_tables(fs); + else + retval = ext2fs_allocate_tables(fs); if (retval) { - com_err(program_name, retval, + com_err(program_name, retval, "%s", _("while trying to allocate filesystem tables")); exit(1); } + if (!quiet) + printf("%s", _("done \n")); + + retval = ext2fs_convert_subcluster_bitmap(fs, &fs->block_map); + if (retval) { + com_err(program_name, retval, "%s", + _("\n\twhile converting subcluster bitmap")); + exit(1); + } + if (super_only) { fs->super->s_state |= EXT2_ERROR_FS; fs->flags &= ~(EXT2_FLAG_IB_DIRTY|EXT2_FLAG_BB_DIRTY); + /* + * The command "mke2fs -S" is used to recover + * corrupted file systems, so do not mark any of the + * inodes as unused; we want e2fsck to consider all + * inodes as potentially containing recoverable data. + */ + if (fs->super->s_feature_ro_compat & + EXT4_FEATURE_RO_COMPAT_GDT_CSUM) { + for (i = 0; i < fs->group_desc_count; i++) + ext2fs_bg_itable_unused_set(fs, i, 0); + } } else { /* rsv must be a power of two (64kB is MD RAID sb alignment) */ - unsigned int rsv = 65536 / fs->blocksize; - unsigned long blocks = fs->super->s_blocks_count; - unsigned long start; - blk_t ret_blk; + blk64_t rsv = 65536 / fs->blocksize; + blk64_t blocks = ext2fs_blocks_count(fs->super); + blk64_t start; + blk64_t ret_blk; #ifdef ZAP_BOOTBLOCK zap_sector(fs, 0, 2); @@ -2309,12 +2767,12 @@ int main (int argc, char *argv[]) if (start > rsv) start -= rsv; if (start > 0) - retval = ext2fs_zero_blocks(fs, start, blocks - start, + retval = ext2fs_zero_blocks2(fs, start, blocks - start, &ret_blk, NULL); if (retval) { com_err(program_name, retval, - _("while zeroing block %u at end of filesystem"), + _("while zeroing block %llu at end of filesystem"), ret_blk); } write_inode_tables(fs, lazy_itable_init, itable_zeroed); @@ -2327,6 +2785,7 @@ int main (int argc, char *argv[]) retval = ext2fs_create_resize_inode(fs); if (retval) { com_err("ext2fs_create_resize_inode", retval, + "%s", _("while reserving blocks for online resize")); exit(1); } @@ -2336,8 +2795,9 @@ int main (int argc, char *argv[]) if (journal_device) { ext2_filsys jfs; - if (!force) - check_plausibility(journal_device); + if (!check_plausibility(journal_device, CHECK_BLOCK_DEV, + NULL) && !force) + proceed_question(proceed_delay); check_mount(journal_device, force, _("journal")); retval = ext2fs_open(journal_device, EXT2_FLAG_RW| @@ -2362,16 +2822,14 @@ int main (int argc, char *argv[]) exit(1); } if (!quiet) - printf(_("done\n")); - ext2fs_close(jfs); + printf("%s", _("done\n")); + ext2fs_close_free(&jfs); free(journal_device); } else if ((journal_size) || (fs_param.s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL)) { - journal_blocks = figure_journal_size(journal_size, fs); - if (super_only) { - printf(_("Skipping journal creation in super-only mode\n")); + printf("%s", _("Skipping journal creation in super-only mode\n")); fs->super->s_journal_inum = EXT2_JOURNAL_INO; goto no_journal; } @@ -2386,37 +2844,64 @@ int main (int argc, char *argv[]) journal_blocks); fflush(stdout); } - retval = ext2fs_add_journal_inode(fs, journal_blocks, - journal_flags); + retval = ext2fs_add_journal_inode2(fs, journal_blocks, + journal_location, + journal_flags); if (retval) { - com_err (program_name, retval, - _("\n\twhile trying to create journal")); + com_err(program_name, retval, "%s", + _("\n\twhile trying to create journal")); exit(1); } if (!quiet) - printf(_("done\n")); + printf("%s", _("done\n")); } no_journal: + if (!super_only && + fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_MMP) { + retval = ext2fs_mmp_init(fs); + if (retval) { + fprintf(stderr, "%s", + _("\nError while enabling multiple " + "mount protection feature.")); + exit(1); + } + if (!quiet) + printf(_("Multiple mount protection is enabled " + "with update interval %d seconds.\n"), + fs->super->s_mmp_update_interval); + } + + if (EXT2_HAS_RO_COMPAT_FEATURE(&fs_param, + EXT4_FEATURE_RO_COMPAT_BIGALLOC)) + fix_cluster_bg_counts(fs); + if (EXT2_HAS_RO_COMPAT_FEATURE(&fs_param, + EXT4_FEATURE_RO_COMPAT_QUOTA)) + create_quota_inodes(fs); + + retval = mk_hugefiles(fs, device_name); + if (retval) + com_err(program_name, retval, "while creating huge files"); if (!quiet) - printf(_("Writing superblocks and " + printf("%s", _("Writing superblocks and " "filesystem accounting information: ")); - retval = ext2fs_flush(fs); + checkinterval = fs->super->s_checkinterval; + max_mnt_count = fs->super->s_max_mnt_count; + retval = ext2fs_close_free(&fs); if (retval) { - fprintf(stderr, + fprintf(stderr, "%s", _("\nWarning, had trouble writing out superblocks.")); - } - if (!quiet) { - printf(_("done\n\n")); + } else if (!quiet) { + printf("%s", _("done\n\n")); if (!getenv("MKE2FS_SKIP_CHECK_MSG")) - print_check_message(fs); + print_check_message(max_mnt_count, checkinterval); } - val = ext2fs_close(fs); + remove_error_table(&et_ext2_error_table); remove_error_table(&et_prof_error_table); profile_release(profile); for (i=0; fs_types[i]; i++) free(fs_types[i]); free(fs_types); - return (retval || val) ? 1 : 0; + return retval; }