summaryrefslogtreecommitdiff
path: root/misc/mke2fs.c
diff options
context:
space:
mode:
Diffstat (limited to 'misc/mke2fs.c')
-rw-r--r--misc/mke2fs.c666
1 files changed, 367 insertions, 299 deletions
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 93ae4bcc..e062bda0 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -53,6 +53,7 @@ extern int optind;
#include <blkid/blkid.h>
#include "ext2fs/ext2_fs.h"
+#include "ext2fs/ext2fsP.h"
#include "et/com_err.h"
#include "uuid/uuid.h"
#include "e2p/e2p.h"
@@ -65,10 +66,14 @@ extern int optind;
#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);
@@ -118,7 +123,7 @@ static void usage(void)
exit(1);
}
-static int int_log2(int arg)
+static int int_log2(unsigned long long arg)
{
int l = 0;
@@ -130,7 +135,7 @@ static int int_log2(int arg)
return l;
}
-static int int_log10(unsigned int arg)
+static int int_log10(unsigned long long arg)
{
int l;
@@ -203,9 +208,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");
@@ -274,10 +279,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;
@@ -293,100 +298,42 @@ _("Warning: the backup superblock/group descriptors at block %u contain\n"
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)
-{
- if ((progress->format[0] == 0) || progress->skip_progress)
- return;
- printf(progress->format, val, progress->max);
- fputs(progress->backup, stdout);
-}
-
-static void progress_close(struct progress_struct *progress)
-{
- if (progress->format[0] == 0)
- return;
- fputs(_("done \n"), stdout);
-}
-
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,8 +344,9 @@ 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)
@@ -478,7 +426,7 @@ 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) {
@@ -517,7 +465,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 +480,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 +490,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,
_("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,
_("while writing journal superblock"));
exit(1);
}
- progress_close(&progress);
}
static void show_stats(ext2_filsys fs)
@@ -598,22 +548,21 @@ 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 (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,11 +575,11 @@ 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 (s->s_reserved_gdt_blocks)
printf(_("Maximum filesystem blocks=%lu\n"),
@@ -669,7 +618,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");
}
@@ -754,7 +703,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 +715,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,7 +725,7 @@ static void parse_extended_opts(struct ext2_super_block *param,
r_usage++;
continue;
}
- if (resize <= param->s_blocks_count) {
+ if (resize <= ext2fs_blocks_count(param)) {
fprintf(stderr,
_("The resize maximum must be greater "
"than the filesystem size.\n"));
@@ -788,11 +738,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))
@@ -817,6 +767,12 @@ 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, "discard")) {
discard = 1;
} else if (!strcmp(token, "nodiscard")) {
@@ -836,6 +792,7 @@ static void parse_extended_opts(struct ext2_super_block *param,
"\tstripe-width=<RAID stride * data disks in blocks>\n"
"\tresize=<resize maximum size in blocks>\n"
"\tlazy_itable_init=<0 to disable, 1 to enable>\n"
+ "\tlazy_journal_init=<0 to disable, 1 to enable>\n"
"\ttest_fs\n"
"\tdiscard\n"
"\tnodiscard\n\n"),
@@ -863,14 +820,16 @@ static __u32 ok_features[3] = {
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_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
};
@@ -989,6 +948,7 @@ 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,
+ blk64_t fs_blocks_count,
char *progname)
{
const char *ext_type = 0;
@@ -997,7 +957,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))
@@ -1053,12 +1013,16 @@ static char **parse_fs_type(const char *fs_type,
}
meg = (1024 * 1024) / EXT2_BLOCK_SIZE(fs_param);
- if (fs_param->s_blocks_count < 3 * meg)
+ 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;
@@ -1132,6 +1096,18 @@ static int get_int_from_profile(char **fs_types, const char *opt, int def_val)
return ret;
}
+static double get_double_from_profile(char **fs_types, const char *opt,
+ double def_val)
+{
+ double ret;
+ char **cpp;
+
+ profile_get_double(profile, "defaults", opt, 0, def_val, &ret);
+ for (cpp = fs_types; *cpp; cpp++)
+ profile_get_double(profile, "fs_types", *cpp, opt, ret, &ret);
+ return ret;
+}
+
static int get_bool_from_profile(char **fs_types, const char *opt, int def_val)
{
int ret;
@@ -1201,22 +1177,23 @@ out:
static void PRS(int argc, char *argv[])
{
int b, c;
- int size;
+ 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;
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;
+ char * fs_type = 0;
+ char * usage_types = 0;
+ blk64_t dev_size;
+ blk64_t fs_blocks_count = 0;
#ifdef __linux__
struct utsname ut;
#endif
@@ -1230,6 +1207,10 @@ static void PRS(int argc, char *argv[])
if (oldpath)
pathlen += strlen(oldpath);
newpath = malloc(pathlen);
+ if (!newpath) {
+ fprintf(stderr, _("Couldn't allocate memory for new PATH.\n"));
+ exit(1);
+ }
strcpy(newpath, PATH_SET);
/* Update our PATH to include /sbin */
@@ -1260,8 +1241,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);
@@ -1291,7 +1281,7 @@ 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:E:FG:I:J:KL:M:N:O:R:ST:U:V")) != EOF) {
switch (c) {
case 'b':
blocksize = strtol(optarg, &tmp, 0);
@@ -1314,17 +1304,15 @@ 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 = strtoul(optarg, &tmp, 0);
+ if (cluster_size < EXT2_MIN_CLUSTER_SIZE ||
+ cluster_size > EXT2_MAX_CLUSTER_SIZE || *tmp) {
com_err(program_name, 0,
_("invalid fragment size - %s"),
optarg);
exit(1);
}
- fprintf(stderr, _("Warning: fragments not supported. "
- "Ignoring -f option\n"));
break;
case 'g':
fs_param.s_blocks_per_group = strtoul(optarg, &tmp, 0);
@@ -1458,10 +1446,10 @@ static void PRS(int argc, char *argv[])
super_only = 1;
break;
case 't':
- fs_type = optarg;
+ fs_type = strdup(optarg);
break;
case 'T':
- usage_types = optarg;
+ usage_types = strdup(optarg);
break;
case 'U':
fs_uuid = optarg;
@@ -1538,11 +1526,11 @@ static void PRS(int argc, char *argv[])
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);
}
@@ -1554,54 +1542,21 @@ static void PRS(int argc, char *argv[])
check_plausibility(device_name);
check_mount(device_name, force, _("filesystem"));
- 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;
+ /* Determine the size of the device (if possible) */
+ if (noaction && fs_blocks_count) {
+ dev_size = fs_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;
- }
- }
-
- if (retval == EFBIG) {
- blk64_t big_dev_size;
-
- if (blocksize < 4096) {
- fs_param.s_log_block_size = 2;
- blocksize = 4096;
- }
+ } 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,
_("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,
_("Couldn't determine device size; you "
@@ -1621,19 +1576,32 @@ 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)) {
+ } else if (!force && (fs_blocks_count > dev_size)) {
com_err(program_name, 0,
_("Filesystem larger than apparent device size."));
proceed_question();
}
- 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"));
exit(1);
@@ -1661,14 +1629,43 @@ 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);
+
+ /*
+ * 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) && (blocksize == 0)) {
+ fs_blocks_count /= 4; /* Try using a 4k blocksize */
+ blocksize = 4096;
+ fs_param.s_log_block_size = 2;
+ }
+ 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");
@@ -1710,6 +1707,18 @@ got_size:
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;
@@ -1770,7 +1779,9 @@ got_size:
if ((blocksize < 0) && (use_bsize < (-blocksize)))
use_bsize = -blocksize;
blocksize = use_bsize;
- fs_param.s_blocks_count /= blocksize / 1024;
+ ext2fs_blocks_count_set(&fs_param,
+ ext2fs_blocks_count(&fs_param) /
+ (blocksize / 1024));
} else {
if (blocksize < lsector_size) { /* Impossible */
com_err(program_name, EINVAL,
@@ -1785,16 +1796,27 @@ got_size:
}
}
+ fs_param.s_log_block_size =
+ int_log2(blocksize >> EXT2_MIN_BLOCK_LOG_SIZE);
+ 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);
+ } 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) {
@@ -1819,6 +1841,9 @@ 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;
/* Get options from profile */
for (cpp = fs_types; *cpp; cpp++) {
@@ -1885,13 +1910,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 +1932,31 @@ 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) *
(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);
+
+ free(fs_type);
+ free(usage_types);
}
static int should_do_undo(const char *name)
@@ -1954,7 +1987,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,8 +2012,8 @@ open_err_out:
static int mke2fs_setup_tdb(const char *name, io_manager *io_ptr)
{
- errcode_t retval = 0;
- char *tdb_dir, *tdb_file;
+ errcode_t retval = ENOMEM;
+ char *tdb_dir, *tdb_file = NULL;
char *device_name, *tmp_name;
/*
@@ -1998,103 +2031,111 @@ static int mke2fs_setup_tdb(const char *name, io_manager *io_ptr)
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;
- }
+ if (!tmp_name)
+ goto errout;
device_name = basename(tmp_name);
tdb_file = malloc(strlen(tdb_dir) + 8 + strlen(device_name) + 7 + 1);
- if (!tdb_file)
- goto alloc_fn_fail;
+ if (!tdb_file) {
+ free(tmp_name);
+ goto errout;
+ }
sprintf(tdb_file, "%s/mke2fs-%s.e2undo", tdb_dir, device_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;
+ 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);
free(tdb_file);
- free(tmp_name);
+ return 0;
+
+errout:
+ free(tdb_file);
+ com_err(program_name, retval,
+ _("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 = 0;
+ int retval = 0;
-#ifndef BLKDISCARD
-#define BLKDISCARD _IO(0x12,119)
-#endif
+ retval = io_channel_discard(fs->io, 0, 0);
+ if (retval)
+ return retval;
-#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)
-{
- 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"));
- }
- close(fd);
+ 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;
}
- return ret;
-}
-static int mke2fs_discard_zeroes_data(ext2_filsys fs)
-{
- int fd;
- int ret;
- int discard_zeroes_data = 0;
+ 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"));
- fd = open64(fs->device_name, O_RDWR);
+ return retval;
+}
- if (fd > 0) {
- ioctl(fd, BLKDISCARDZEROES, &discard_zeroes_data);
- close(fd);
+static void fix_cluster_bg_counts(ext2_filsys fs)
+{
+ blk64_t cluster, num_clusters, tot_free;
+ int grp_free, num_free, group, num;
+
+ num_clusters = EXT2FS_B2C(fs, ext2fs_blocks_count(fs->super));
+ tot_free = num_free = num = group = grp_free = 0;
+ for (cluster = EXT2FS_B2C(fs, fs->super->s_first_data_block);
+ cluster < num_clusters; cluster++) {
+ if (!ext2fs_test_block_bitmap2(fs->block_map,
+ EXT2FS_C2B(fs, cluster))) {
+ grp_free++;
+ tot_free++;
+ }
+ num++;
+ if ((num == fs->super->s_clusters_per_group) ||
+ (cluster == num_clusters-1)) {
+ ext2fs_bg_free_blocks_count_set(fs, group, grp_free);
+ ext2fs_group_desc_csum_set(fs, group);
+ num = 0;
+ grp_free = 0;
+ group++;
+ }
}
- return discard_zeroes_data;
+ ext2fs_free_blocks_count_set(fs->super, EXT2FS_C2B(fs, tot_free));
}
-#else
-#define mke2fs_discard_blocks(fs) 1
-#define mke2fs_discard_zeroes_data(fs) 0
-#endif
int main (int argc, char *argv[])
{
@@ -2104,6 +2145,8 @@ int main (int argc, char *argv[])
unsigned int journal_blocks;
unsigned int i;
int val, hash_alg;
+ int flags;
+ int old_bitmaps;
io_manager io_ptr;
char tdb_string[40];
char *hash_alg_str;
@@ -2134,8 +2177,19 @@ 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;
+ 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"));
exit(1);
@@ -2143,9 +2197,8 @@ int main (int argc, char *argv[])
/* Can't undo discard ... */
if (!noaction && discard && (io_ptr != undo_io_manager)) {
- retval = mke2fs_discard_blocks(fs);
-
- if (!retval && mke2fs_discard_zeroes_data(fs)) {
+ 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"));
@@ -2280,21 +2333,33 @@ int main (int argc, char *argv[])
handle_bad_blocks(fs, bb_list);
fs->stride = fs_stride = fs->super->s_raid_stride;
+ if (!quiet)
+ printf(_("Allocating group tables: "));
retval = ext2fs_allocate_tables(fs);
if (retval) {
com_err(program_name, retval,
_("while trying to allocate filesystem tables"));
exit(1);
}
+ if (!quiet)
+ printf(_("done \n"));
+
+ retval = ext2fs_convert_subcluster_bitmap(fs, &fs->block_map);
+ if (retval) {
+ com_err(program_name, retval,
+ _("\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);
} 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 +2374,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);
@@ -2398,6 +2463,9 @@ int main (int argc, char *argv[])
}
no_journal:
+ if (EXT2_HAS_RO_COMPAT_FEATURE(&fs_param,
+ EXT4_FEATURE_RO_COMPAT_BIGALLOC))
+ fix_cluster_bg_counts(fs);
if (!quiet)
printf(_("Writing superblocks and "
"filesystem accounting information: "));
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 03:02:21 +0000