/*
* mke2fs.c - Make a ext2fs filesystem.
*
- * Copyright (C) 1994 Theodore Ts'o. This file may be redistributed
- * under the terms of the GNU Public License.
+ * Copyright (C) 1994, 1995, 1996, 1997 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
*/
/* Usage: mke2fs [options] device
#include <string.h>
#include <fcntl.h>
#include <ctype.h>
-#include <termios.h>
#include <time.h>
+#ifdef linux
+#include <sys/utsname.h>
+#endif
#ifdef HAVE_GETOPT_H
#include <getopt.h>
+#else
+extern char *optarg;
+extern int optind;
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#ifdef HAVE_MNTENT_H
#include <mntent.h>
#endif
-#include <malloc.h>
#include <sys/ioctl.h>
#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#ifdef HAVE_LINUX_FS_H
-#include <linux/fs.h>
-#endif
#include <linux/ext2_fs.h>
-#ifdef HAVE_LINUX_MAJOR_H
-#include <linux/major.h>
-#endif
#include "et/com_err.h"
#include "uuid/uuid.h"
+#include "e2p/e2p.h"
#include "ext2fs/ext2fs.h"
+#include "util.h"
#include "../version.h"
+#include "nls-enable.h"
#define STRIDE_LENGTH 8
-#ifndef sparc
+#ifndef __sparc__
#define ZAP_BOOTBLOCK
#endif
extern FILE *fpopen(const char *cmd, const char *mode);
const char * program_name = "mke2fs";
-const char * device_name = NULL;
+const char * device_name /* = NULL */;
/* Command line options */
-int cflag = 0;
-int verbose = 0;
-int quiet = 0;
-int super_only = 0;
-int force = 0;
-char *bad_blocks_filename = 0;
+int cflag /* = 0 */ ;
+int verbose /* = 0 */ ;
+int quiet /* = 0 */ ;
+int super_only /* = 0 */ ;
+int force /* = 0 */ ;
+int noaction /* = 0 */ ;
+int journal_size /* = 0 */ ;
+int journal_flags /* = 0 */ ;
+char *bad_blocks_filename /* = 0 */ ;
+__u32 fs_stride /* = 0 */ ;
struct ext2_super_block param;
-char *creator_os = NULL;
-char *volume_label = NULL;
-char *mount_dir = NULL;
+char *creator_os /* = NULL */ ;
+char *volume_label /* = NULL */ ;
+char *mount_dir /* = NULL */ ;
+char *journal_device /* = NULL */ ;
-static void usage(NOARGS)
+static void usage(void)
{
- fprintf(stderr, "Usage: %s [-c|-t|-l filename] [-b block-size] "
- "[-f fragment-size]\n\t[-i bytes-per-inode] "
- "[-m reserved-blocks-percentage] [-qvS]\n\t"
- "[-o creator-os] [-g blocks-per-group] [-L volume-label]\n\t"
- "[-M last-mounted-directory] device [blocks-count]\n",
+ fprintf(stderr, _("Usage: %s [-c|-t|-l filename] [-b block-size] "
+ "[-f fragment-size]\n\t[-i bytes-per-inode] [-j journal-options]"
+ " [-N number-of-inodes]\n\t[-m reserved-blocks-percentage] "
+ "[-o creator-os] [-g blocks-per-group]\n\t[-L volume-label] "
+ "[-M last-mounted-directory] [-O feature[,...]]\n\t"
+ "[-r fs-revision] [-R raid_opts] [-s sparse-super-flag]\n\t"
+ "[-qvSV] device [blocks-count]\n"),
program_name);
exit(1);
}
-static int log2(int arg)
+static int int_log2(int arg)
{
int l = 0;
return l;
}
-static void check_plausibility(NOARGS)
+static int int_log10(unsigned int arg)
{
-#ifdef HAVE_LINUX_MAJOR_H
- int val;
- struct stat s;
-
- val = stat(device_name, &s);
-
- if(val == -1) {
- perror("stat");
- exit(1);
- }
- if(!S_ISBLK(s.st_mode)) {
- printf("%s is not a block special device.\n", device_name);
- printf("Proceed anyway? (y,n) ");
- if (getchar() != 'y')
- exit(1);
- return;
- }
- if ((MAJOR(s.st_rdev) == HD_MAJOR && MINOR(s.st_rdev)%64 == 0) ||
- (MAJOR(s.st_rdev) == SCSI_DISK_MAJOR &&
- MINOR(s.st_rdev)%16 == 0)) {
- printf("%s is entire device, not just one partition!\n",
- device_name);
- printf("Proceed anyway? (y,n) ");
- if (getchar() != 'y')
- exit(1);
- return;
- }
-#endif
+ int l;
+
+ for (l=0; arg ; l++)
+ arg = arg / 10;
+ return l;
}
-static void check_mount(NOARGS)
+/*
+ * This function sets the default parameters for a filesystem
+ *
+ * The type is specified by the user. The size is the maximum size
+ * (in megabytes) for which a set of parameters applies, with a size
+ * of zero meaning that it is the default parameter for the type.
+ * Note that order is important in the table below.
+ */
+static char default_str[] = "default";
+struct mke2fs_defaults {
+ const char *type;
+ int size;
+ int blocksize;
+ int inode_ratio;
+} settings[] = {
+ { default_str, 0, 4096, 8192 },
+ { default_str, 512, 1024, 4096 },
+ { default_str, 3, 1024, 8192 },
+ { "news", 0, 4096, 4096 },
+ { 0, 0, 0, 0},
+};
+
+static void set_fs_defaults(char *fs_type, struct ext2_super_block *super,
+ int blocksize, int *inode_ratio)
{
- errcode_t retval;
- int mount_flags;
+ int megs;
+ int ratio = 0;
+ struct mke2fs_defaults *p;
- retval = ext2fs_check_if_mounted(device_name, &mount_flags);
- if (retval) {
- com_err("ext2fs_check_if_mount", retval,
- "while determining whether %s is mounted.",
- device_name);
- return;
+ megs = (super->s_blocks_count * (EXT2_BLOCK_SIZE(super) / 1024) /
+ 1024);
+ if (inode_ratio)
+ ratio = *inode_ratio;
+ if (!fs_type)
+ fs_type = default_str;
+ for (p = settings; p->type; p++) {
+ if ((strcmp(p->type, fs_type) != 0) &&
+ (strcmp(p->type, default_str) != 0))
+ continue;
+ if ((p->size != 0) &&
+ (megs > p->size))
+ continue;
+ if (ratio == 0)
+ *inode_ratio = p->inode_ratio;
+ if (blocksize == 0) {
+ super->s_log_frag_size = super->s_log_block_size =
+ int_log2(p->blocksize >> EXT2_MIN_BLOCK_LOG_SIZE);
+ }
}
- if (!(mount_flags & EXT2_MF_MOUNTED))
- return;
-
- fprintf(stderr, "%s is mounted; will not make a filesystem here!\n",
- device_name);
- exit(1);
+ if (blocksize == 0)
+ super->s_blocks_count /= EXT2_BLOCK_SIZE(super) / 1024;
}
/*
*/
static void invalid_block(ext2_filsys fs, blk_t blk)
{
- printf("Bad block %u out of range; ignored.\n", blk);
+ printf(_("Bad block %u out of range; ignored.\n"), blk);
return;
}
f = fopen(bad_blocks_file, "r");
if (!f) {
com_err("read_bad_blocks_file", errno,
- "while trying to open %s", bad_blocks_file);
+ _("while trying to open %s"), bad_blocks_file);
exit(1);
}
retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block);
fclose (f);
if (retval) {
com_err("ext2fs_read_bb_FILE", retval,
- "while reading in list of bad blocks from file");
+ _("while reading in list of bad blocks from file"));
exit(1);
}
}
errcode_t retval;
char buf[1024];
- sprintf(buf, "badblocks %s%s %d", quiet ? "" : "-s ",
- fs->device_name,
+ sprintf(buf, "badblocks -b %d %s%s %d", fs->blocksize,
+ quiet ? "" : "-s ", fs->device_name,
fs->super->s_blocks_count);
if (verbose)
- printf("Running command: %s\n", buf);
+ printf(_("Running command: %s\n"), buf);
f = popen(buf, "r");
if (!f) {
com_err("popen", errno,
- "while trying run '%s'", buf);
+ _("while trying run '%s'"), buf);
exit(1);
}
retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block);
pclose(f);
if (retval) {
com_err("ext2fs_read_bb_FILE", retval,
- "while processing list of bad blocks from program");
+ _("while processing list of bad blocks from program"));
exit(1);
}
}
must_be_good = fs->super->s_first_data_block + 1 + fs->desc_blocks;
for (i = fs->super->s_first_data_block; i <= must_be_good; i++) {
if (badblocks_list_test(bb_list, i)) {
- fprintf(stderr, "Block %d in primary superblock/group "
- "descriptor area bad.\n", i);
- fprintf(stderr, "Blocks %d through %d must be good "
- "in order to build a filesystem.\n",
+ fprintf(stderr, _("Block %d in primary "
+ "superblock/group descriptor area bad.\n"), i);
+ fprintf(stderr, _("Blocks %d through %d must be good "
+ "in order to build a filesystem.\n"),
fs->super->s_first_data_block, must_be_good);
- fprintf(stderr, "Aborting....\n");
+ fprintf(stderr, _("Aborting....\n"));
exit(1);
}
}
*/
group_block = fs->super->s_first_data_block +
fs->super->s_blocks_per_group;
- group_bad = 0;
for (i = 1; i < fs->group_desc_count; i++) {
+ group_bad = 0;
for (j=0; j < fs->desc_blocks+1; j++) {
if (badblocks_list_test(bb_list, group_block +
j)) {
if (!group_bad)
fprintf(stderr,
-"Warning: the backup superblock/group descriptors at block %d contain\n"
-" bad blocks.\n\n",
+_("Warning: the backup superblock/group descriptors at block %d contain\n"
+" bad blocks.\n\n"),
group_block);
group_bad++;
group = ext2fs_group_of_blk(fs, group_block+j);
retval = badblocks_list_iterate_begin(bb_list, &bb_iter);
if (retval) {
com_err("badblocks_list_iterate_begin", retval,
- "while marking bad blocks as used");
+ _("while marking bad blocks as used"));
exit(1);
}
while (badblocks_list_iterate(bb_iter, &blk))
badblocks_list_iterate_end(bb_iter);
}
-static void new_table_block(ext2_filsys fs, blk_t first_block,
- const char *name, int num, int initialize,
- const char *buf, blk_t *new_block)
+static void write_inode_tables(ext2_filsys fs)
{
errcode_t retval;
blk_t blk;
- int i;
- int count;
-
- retval = ext2fs_get_free_blocks(fs, first_block,
- first_block + fs->super->s_blocks_per_group,
- num, fs->block_map, new_block);
- if (retval) {
- printf("Could not allocate %d block(s) for %s: %s\n",
- num, name, error_message(retval));
- ext2fs_unmark_valid(fs);
- return;
- }
- if (initialize) {
- blk = *new_block;
- for (i=0; i < num; i += STRIDE_LENGTH, blk += STRIDE_LENGTH) {
- if (num-i > STRIDE_LENGTH)
- count = STRIDE_LENGTH;
- else
- count = num - i;
- retval = io_channel_write_blk(fs->io, blk, count, buf);
- if (retval)
- printf("Warning: could not write %d blocks "
- "starting at %d for %s: %s\n",
- count, blk, name,
- error_message(retval));
- }
- }
- blk = *new_block;
- for (i = 0; i < num; i++, blk++)
- ext2fs_mark_block_bitmap(fs->block_map, blk);
-}
+ int i, j, num, count;
+ char *buf;
+ char format[20], backup[80];
+ int sync_kludge = 0;
+ char *mke2fs_sync;
-static void alloc_tables(ext2_filsys fs)
-{
- blk_t group_blk;
- int i;
- char *buf;
+ mke2fs_sync = getenv("MKE2FS_SYNC");
+ if (mke2fs_sync)
+ sync_kludge = atoi(mke2fs_sync);
buf = malloc(fs->blocksize * STRIDE_LENGTH);
if (!buf) {
- com_err("malloc", ENOMEM, "while allocating zeroizing buffer");
+ com_err("malloc", ENOMEM,
+ _("while allocating zeroizing buffer"));
exit(1);
}
memset(buf, 0, fs->blocksize * STRIDE_LENGTH);
-
- group_blk = fs->super->s_first_data_block;
+
+ /*
+ * Figure out how many digits we need
+ */
+ i = int_log10(fs->group_desc_count);
+ sprintf(format, "%%%dd/%%%dld", i, i);
+ memset(backup, '\b', sizeof(backup)-1);
+ backup[sizeof(backup)-1] = 0;
+ if ((2*i)+1 < sizeof(backup))
+ backup[(2*i)+1] = 0;
+
if (!quiet)
- printf("Writing inode tables: ");
+ printf(_("Writing inode tables: "));
for (i = 0; i < fs->group_desc_count; i++) {
if (!quiet)
- printf("%4d/%4ld", i, fs->group_desc_count);
- new_table_block(fs, group_blk, "block bitmap", 1, 0, buf,
- &fs->group_desc[i].bg_block_bitmap);
- new_table_block(fs, group_blk, "inode bitmap", 1, 0, buf,
- &fs->group_desc[i].bg_inode_bitmap);
- new_table_block(fs, group_blk, "inode table",
- fs->inode_blocks_per_group,
- !super_only, buf,
- &fs->group_desc[i].bg_inode_table);
+ printf(format, i, fs->group_desc_count);
- group_blk += fs->super->s_blocks_per_group;
+ blk = fs->group_desc[i].bg_inode_table;
+ num = fs->inode_blocks_per_group;
+
+ for (j=0; j < num; j += STRIDE_LENGTH, blk += STRIDE_LENGTH) {
+ if (num-j > STRIDE_LENGTH)
+ count = STRIDE_LENGTH;
+ else
+ count = num - j;
+ retval = io_channel_write_blk(fs->io, blk, count, buf);
+ if (retval)
+ printf(_("Warning: could not write %d blocks "
+ "in inode table starting at %d: %s\n"),
+ count, blk, error_message(retval));
+ }
if (!quiet)
- printf("\b\b\b\b\b\b\b\b\b");
+ fputs(backup, stdout);
+ if (sync_kludge) {
+ if (sync_kludge == 1)
+ sync();
+ else if ((i % sync_kludge) == 0)
+ sync();
+ }
}
+ free(buf);
if (!quiet)
- printf("done \n");
+ fputs(_("done \n"), stdout);
}
static void create_root_dir(ext2_filsys fs)
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, _("while creating root dir"));
exit(1);
}
if (geteuid()) {
retval = ext2fs_read_inode(fs, EXT2_ROOT_INO, &inode);
if (retval) {
com_err("ext2fs_read_inode", retval,
- "while reading root inode");
+ _("while reading root inode"));
exit(1);
}
- inode.i_uid = geteuid();
+ inode.i_uid = getuid();
+ if (inode.i_uid)
+ inode.i_gid = getgid();
retval = ext2fs_write_inode(fs, EXT2_ROOT_INO, &inode);
if (retval) {
com_err("ext2fs_write_inode", retval,
- "while setting root inode ownership");
+ _("while setting root inode ownership"));
exit(1);
}
}
static void create_lost_and_found(ext2_filsys fs)
{
errcode_t retval;
- ino_t ino;
+ ext2_ino_t ino;
const char *name = "lost+found";
int i;
+ int lpf_size = 0;
retval = ext2fs_mkdir(fs, EXT2_ROOT_INO, 0, name);
if (retval) {
- com_err("ext2fs_mkdir", retval, "while creating /lost+found");
+ com_err("ext2fs_mkdir", retval,
+ _("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, "while looking up /lost+found");
+ com_err("ext2_lookup", retval,
+ _("while looking up /lost+found"));
exit(1);
}
for (i=1; i < EXT2_NDIR_BLOCKS; i++) {
+ if ((lpf_size += fs->blocksize) >= 16*1024)
+ break;
retval = ext2fs_expand_dir(fs, ino);
if (retval) {
com_err("ext2fs_expand_dir", retval,
- "while expanding /lost+found");
+ _("while expanding /lost+found"));
exit(1);
}
}
retval = ext2fs_update_bb_inode(fs, bb_list);
if (retval) {
com_err("ext2fs_update_bb_inode", retval,
- "while setting bad block inode");
+ _("while setting bad block inode"));
exit(1);
}
static void reserve_inodes(ext2_filsys fs)
{
- ino_t i;
- int group;
+ ext2_ino_t i;
+ int group;
for (i = EXT2_ROOT_INO + 1; i < EXT2_FIRST_INODE(fs->super); i++) {
ext2fs_mark_inode_bitmap(fs->inode_map, i);
ext2fs_mark_ib_dirty(fs);
}
-#ifdef ZAP_BOOTBLOCK
-static void zap_bootblock(ext2_filsys fs)
+static void zap_sector(ext2_filsys fs, int sect)
{
char buf[512];
int retval;
memset(buf, 0, 512);
- retval = io_channel_write_blk(fs->io, 0, -512, buf);
+ io_channel_set_blksize(fs->io, 512);
+ retval = io_channel_write_blk(fs->io, sect, -512, buf);
+ io_channel_set_blksize(fs->io, fs->blocksize);
if (retval)
- printf("Warning: could not erase block 0: %s\n",
+ printf(_("Warning: could not erase sector %d: %s\n"), sect,
error_message(retval));
}
-#endif
static void show_stats(ext2_filsys fs)
{
- struct ext2fs_sb *s = (struct ext2fs_sb *) fs->super;
+ struct ext2_super_block *s = fs->super;
char buf[80];
blk_t group_block;
- int i, col_left;
+ int i, need, col_left;
if (param.s_blocks_count != s->s_blocks_count)
- printf("warning: %d blocks unused.\n\n",
+ printf(_("warning: %d blocks unused.\n\n"),
param.s_blocks_count - s->s_blocks_count);
-
+
+ memset(buf, 0, sizeof(buf));
+ strncpy(buf, s->s_volume_name, sizeof(s->s_volume_name));
+ printf(_("Filesystem label=%s\n"), buf);
+ printf(_("OS type: "));
switch (fs->super->s_creator_os) {
case EXT2_OS_LINUX: printf ("Linux"); break;
- case EXT2_OS_HURD: printf ("GNU/hurd"); break;
+ case EXT2_OS_HURD: printf ("GNU/Hurd"); break;
case EXT2_OS_MASIX: printf ("Masix"); break;
- default: printf ("(unknown os)");
+ default: printf (_("(unknown os)"));
}
- printf (" ext2 filesystem format\n");
- memset(buf, 0, sizeof(buf));
- strncpy(buf, s->s_volume_name, sizeof(s->s_volume_name));
- printf("Filesystem label=%s\n", buf);
- printf("%u inodes, %u blocks\n", s->s_inodes_count,
+ printf("\n");
+ printf(_("Block size=%u (log=%u)\n"), fs->blocksize,
+ s->s_log_block_size);
+ printf(_("Fragment size=%u (log=%u)\n"), fs->fragsize,
+ s->s_log_frag_size);
+ 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",
+ 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("First data block=%u\n", s->s_first_data_block);
- printf("Block size=%u (log=%u)\n", fs->blocksize,
- s->s_log_block_size);
- printf("Fragment size=%u (log=%u)\n", fs->fragsize,
- s->s_log_frag_size);
- printf("%lu block group%s\n", fs->group_desc_count,
- (fs->group_desc_count > 1) ? "s" : "");
- printf("%u blocks per group, %u fragments per group\n",
+ printf(_("First data block=%u\n"), s->s_first_data_block);
+ if (fs->group_desc_count > 1)
+ printf(_("%u block groups\n"), fs->group_desc_count);
+ else
+ printf(_("%u block group\n"), fs->group_desc_count);
+ printf(_("%u blocks per group, %u fragments per group\n"),
s->s_blocks_per_group, s->s_frags_per_group);
- printf("%u inodes per group\n", s->s_inodes_per_group);
+ printf(_("%u inodes per group\n"), s->s_inodes_per_group);
if (fs->group_desc_count == 1) {
printf("\n");
return;
}
- printf("Superblock backups stored on blocks: ");
+ printf(_("Superblock backups stored on blocks: "));
group_block = s->s_first_data_block;
col_left = 0;
for (i = 1; i < fs->group_desc_count; i++) {
group_block += s->s_blocks_per_group;
- if (!col_left--) {
+ if (!ext2fs_bg_has_super(fs, i))
+ continue;
+ if (i != 1)
+ printf(", ");
+ need = int_log10(group_block) + 2;
+ if (need > col_left) {
printf("\n\t");
- col_left = 8;
+ col_left = 72;
}
+ col_left -= need;
printf("%u", group_block);
- if (i != fs->group_desc_count - 1)
- printf(", ");
}
printf("\n\n");
}
-#ifndef HAVE_STRCASECMP
-static int strcasecmp (char *s1, char *s2)
-{
- while (*s1 && *s2) {
- int ch1 = *s1++, ch2 = *s2++;
- if (isupper (ch1))
- ch1 = tolower (ch1);
- if (isupper (ch2))
- ch2 = tolower (ch2);
- if (ch1 != ch2)
- return ch1 - ch2;
- }
- return *s1 ? 1 : *s2 ? -1 : 0;
-}
-#endif
-
/*
* Set the S_CREATOR_OS field. Return true if OS is known,
* otherwise, 0.
#define PATH_SET "PATH=/sbin"
+static void parse_raid_opts(const char *opts)
+{
+ char *buf, *token, *next, *p, *arg;
+ int len;
+ int raid_usage = 0;
+
+ len = strlen(opts);
+ buf = malloc(len+1);
+ if (!buf) {
+ fprintf(stderr, _("Couldn't allocate memory to parse "
+ "raid options!\n"));
+ exit(1);
+ }
+ strcpy(buf, opts);
+ for (token = buf; token && *token; token = next) {
+ p = strchr(token, ',');
+ next = 0;
+ if (p) {
+ *p = 0;
+ next = p+1;
+ }
+ arg = strchr(token, '=');
+ if (arg) {
+ *arg = 0;
+ arg++;
+ }
+ if (strcmp(token, "stride") == 0) {
+ if (!arg) {
+ raid_usage++;
+ continue;
+ }
+ fs_stride = strtoul(arg, &p, 0);
+ if (*p || (fs_stride == 0)) {
+ fprintf(stderr,
+ _("Invalid stride parameter.\n"));
+ raid_usage++;
+ continue;
+ }
+ } else
+ raid_usage++;
+ }
+ if (raid_usage) {
+ fprintf(stderr, _("\nBad raid options specified.\n\n"
+ "Raid options are separated by commas, "
+ "and may take an argument which\n"
+ "\tis set off by an equals ('=') sign.\n\n"
+ "Valid raid options are:\n"
+ "\tstride=<stride length in blocks>\n\n"));
+ exit(1);
+ }
+}
+
+static __u32 ok_features[3] = {
+ 0, /* Compat */
+ EXT2_FEATURE_INCOMPAT_FILETYPE, /* Incompat */
+ EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER /* R/O compat */
+};
+
+
static void PRS(int argc, char *argv[])
{
- char c;
- int size;
- char * tmp;
- int inode_ratio = 4096;
- int reserved_ratio = 5;
+ int c;
+ int size;
+ char * tmp;
+ blk_t group_blk_max = 8192;
+ int blocksize = 0;
+ int inode_ratio = 0;
+ int reserved_ratio = 5;
+ ext2_ino_t num_inodes = 0;
errcode_t retval;
- char *oldpath = getenv("PATH");
+ int sparse_option = 1;
+ char * oldpath = getenv("PATH");
+ struct ext2_super_block *param_ext2 = ¶m;
+ char * raid_opts = 0;
+ char * journal_opts = 0;
+ char * fs_type = 0;
+ const char * feature_set = "filetype";
+ blk_t dev_size;
+#ifdef linux
+ struct utsname ut;
+ if (uname(&ut)) {
+ perror("uname");
+ exit(1);
+ }
+ if ((ut.release[0] == '1') ||
+ (ut.release[0] == '2' && ut.release[1] == '.' &&
+ ut.release[2] < '2' && ut.release[3] == '.'))
+ feature_set = NULL;
+#endif
/* Update our PATH to include /sbin */
if (oldpath) {
char *newpath;
setbuf(stderr, NULL);
initialize_ext2_error_table();
memset(¶m, 0, sizeof(struct ext2_super_block));
+ param.s_rev_level = 1; /* Create revision 1 filesystems now */
- fprintf (stderr, "mke2fs %s, %s for EXT2 FS %s, %s\n",
+ fprintf (stderr, _("mke2fs %s, %s for EXT2 FS %s, %s\n"),
E2FSPROGS_VERSION, E2FSPROGS_DATE,
EXT2FS_VERSION, EXT2FS_DATE);
if (argc && *argv)
program_name = *argv;
while ((c = getopt (argc, argv,
- "b:cf:g:i:l:m:o:qr:tvI:SFL:M:")) != EOF)
+ "b:cf:g:i:j:l:m:no:qr:R:s:tvI:ST:FL:M:N:O:V")) != EOF)
switch (c) {
case 'b':
- size = strtoul(optarg, &tmp, 0);
- if (size < 1024 || size > 4096 || *tmp) {
- com_err(program_name, 0, "bad block size - %s",
- optarg);
+ blocksize = strtoul(optarg, &tmp, 0);
+ if (blocksize < 1024 || blocksize > 4096 || *tmp) {
+ com_err(program_name, 0,
+ _("bad block size - %s"), optarg);
exit(1);
}
param.s_log_block_size =
- log2(size >> EXT2_MIN_BLOCK_LOG_SIZE);
+ int_log2(blocksize >> EXT2_MIN_BLOCK_LOG_SIZE);
+ group_blk_max = blocksize * 8;
break;
case 'c':
case 't': /* Check for bad blocks */
case 'f':
size = strtoul(optarg, &tmp, 0);
if (size < 1024 || size > 4096 || *tmp) {
- com_err(program_name, 0, "bad fragment size - %s",
+ com_err(program_name, 0,
+ _("bad fragment size - %s"),
optarg);
exit(1);
}
param.s_log_frag_size =
- log2(size >> EXT2_MIN_BLOCK_LOG_SIZE);
- printf("Warning: fragments not supported. "
- "Ignoring -f option\n");
+ int_log2(size >> EXT2_MIN_BLOCK_LOG_SIZE);
+ printf(_("Warning: fragments not supported. "
+ "Ignoring -f option\n"));
break;
case 'g':
param.s_blocks_per_group = strtoul(optarg, &tmp, 0);
if (*tmp) {
com_err(program_name, 0,
- "Illegal number for blocks per group");
- exit(1);
- }
- if (param.s_blocks_per_group < 256 ||
- param.s_blocks_per_group > 8192 || *tmp) {
- com_err(program_name, 0,
- "blocks per group count out of range");
+ _("Illegal number for blocks per group"));
exit(1);
}
if ((param.s_blocks_per_group % 8) != 0) {
com_err(program_name, 0,
- "blocks per group must be multiple of 8");
+ _("blocks per group must be multiple of 8"));
exit(1);
}
break;
inode_ratio = strtoul(optarg, &tmp, 0);
if (inode_ratio < 1024 || inode_ratio > 256 * 1024 ||
*tmp) {
- com_err(program_name, 0, "bad inode ratio - %s",
- optarg);
+ com_err(program_name, 0,
+ _("bad inode ratio - %s"), optarg);
exit(1);
}
break;
+ case 'j':
+ journal_opts = optarg;
+ break;
case 'l':
bad_blocks_filename = malloc(strlen(optarg)+1);
if (!bad_blocks_filename) {
com_err(program_name, ENOMEM,
- "in malloc for bad_blocks_filename");
+ _("in malloc for bad_blocks_filename"));
exit(1);
}
strcpy(bad_blocks_filename, optarg);
reserved_ratio = strtoul(optarg, &tmp, 0);
if (reserved_ratio > 50 || *tmp) {
com_err(program_name, 0,
- "bad reserved blocks percent - %s",
+ _("bad reserved blocks percent - %s"),
optarg);
exit(1);
}
break;
+ case 'n':
+ noaction++;
+ break;
case 'o':
creator_os = optarg;
break;
case 'r':
param.s_rev_level = atoi(optarg);
break;
+ case 's':
+ sparse_option = atoi(optarg);
+ break;
#ifdef EXT2_DYNAMIC_REV
case 'I':
param.s_inode_size = atoi(optarg);
break;
#endif
+ case 'N':
+ num_inodes = atoi(optarg);
+ break;
case 'v':
verbose = 1;
break;
case 'M':
mount_dir = optarg;
break;
+ case 'O':
+ feature_set = optarg;
+ break;
+ case 'R':
+ raid_opts = optarg;
+ break;
case 'S':
super_only = 1;
break;
+ case 'T':
+ fs_type = optarg;
+ break;
+ case 'V':
+ /* Print version number and exit */
+ fprintf(stderr, _("\tUsing %s\n"),
+ error_message(EXT2_ET_BASE));
+ exit(0);
default:
usage();
}
device_name = argv[optind];
optind++;
if (optind < argc) {
- param.s_blocks_count = strtoul(argv[optind++], &tmp, 0);
- if (*tmp) {
- com_err(program_name, 0, "bad blocks count - %s",
+ unsigned long tmp2 = strtoul(argv[optind++], &tmp, 0);
+
+ if ((*tmp) || (tmp2 > 0xfffffffful)) {
+ com_err(program_name, 0, _("bad blocks count - %s"),
argv[optind - 1]);
exit(1);
}
+ param.s_blocks_count = tmp2;
}
if (optind < argc)
usage();
+ if (raid_opts)
+ parse_raid_opts(raid_opts);
+
+ if (journal_opts)
+ parse_journal_opts(journal_opts);
+
if (!force)
- check_plausibility();
- check_mount();
+ check_plausibility(device_name);
+ check_mount(device_name, force, _("filesystem"));
param.s_log_frag_size = param.s_log_block_size;
- if (!param.s_blocks_count) {
+ if (noaction && param.s_blocks_count) {
+ dev_size = param.s_blocks_count;
+ retval = 0;
+ } else
retval = ext2fs_get_device_size(device_name,
EXT2_BLOCK_SIZE(¶m),
- ¶m.s_blocks_count);
- if (retval) {
- com_err(program_name, retval,
- "while trying to determine filesystem size");
+ &dev_size);
+ if (retval && (retval != EXT2_ET_UNIMPLEMENTED)) {
+ com_err(program_name, retval,
+ _("while trying to determine filesystem size"));
+ exit(1);
+ }
+ if (!param.s_blocks_count) {
+ if (retval == EXT2_ET_UNIMPLEMENTED) {
+ com_err(program_name, 0,
+ _("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,
+ _("Device size reported to be zero. "
+ "Invalid partition specified, or\n\t"
+ "partition table wasn't reread "
+ "after running fdisk, due to\n\t"
+ "a modified partition being busy "
+ "and in use. You may need to reboot\n\t"
+ "to re-read your partition table.\n"
+ ));
+ exit(1);
+ }
+ param.s_blocks_count = dev_size;
+ }
+
+ } else if (!force && (param.s_blocks_count > dev_size)) {
+ com_err(program_name, 0,
+ _("Filesystem larger than apparent filesystem size."));
+ proceed_question();
+ }
+
+ set_fs_defaults(fs_type, param_ext2, blocksize, &inode_ratio);
+
+ if (param.s_blocks_per_group) {
+ if (param.s_blocks_per_group < 256 ||
+ param.s_blocks_per_group > group_blk_max || *tmp) {
+ com_err(program_name, 0,
+ _("blocks per group count out of range"));
exit(1);
}
}
/*
* Calculate number of inodes based on the inode ratio
*/
- param.s_inodes_count =
- ((long long) param.s_blocks_count * EXT2_BLOCK_SIZE(¶m))
+ param.s_inodes_count = num_inodes ? num_inodes :
+ ((__u64) param.s_blocks_count * EXT2_BLOCK_SIZE(¶m))
/ inode_ratio;
/*
* Calculate number of blocks to reserve
*/
param.s_r_blocks_count = (param.s_blocks_count * reserved_ratio) / 100;
+
+ /* Turn off features not supported by the earlier filesystem version */
+ if (param.s_rev_level == 0) {
+ sparse_option = 0;
+ feature_set = NULL;
+ }
+ if (sparse_option)
+ param_ext2->s_feature_ro_compat |=
+ EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
+
+ if (feature_set && !strncasecmp(feature_set, "none", 4))
+ feature_set = NULL;
+ if (feature_set && e2p_edit_feature(feature_set,
+ ¶m_ext2->s_feature_compat,
+ ok_features)) {
+ fprintf(stderr, _("Invalid filesystem option set: %s\n"),
+ feature_set);
+ exit(1);
+ }
}
int main (int argc, char *argv[])
errcode_t retval = 0;
ext2_filsys fs;
badblocks_list bb_list = 0;
- struct ext2fs_sb *s;
-
+ int journal_blocks;
+
+#ifdef ENABLE_NLS
+ setlocale(LC_MESSAGES, "");
+ bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
+ textdomain(NLS_CAT_NAME);
+#endif
PRS(argc, argv);
/*
retval = ext2fs_initialize(device_name, 0, ¶m,
unix_io_manager, &fs);
if (retval) {
- com_err(device_name, retval, "while setting up superblock");
+ com_err(device_name, retval, _("while setting up superblock"));
exit(1);
}
/*
+ * Wipe out the old on-disk superblock
+ */
+ zap_sector(fs, 2);
+
+ /*
* Generate a UUID for it...
*/
- s = (struct ext2fs_sb *) fs->super;
- uuid_generate(s->s_uuid);
+ uuid_generate(fs->super->s_uuid);
/*
* Override the creator OS, if applicable
*/
if (creator_os && !set_os(fs->super, creator_os)) {
- com_err (program_name, 0, "unknown os - %s", creator_os);
+ com_err (program_name, 0, _("unknown os - %s"), creator_os);
exit(1);
}
/*
+ * For the Hurd, we will turn off filetype since it doesn't
+ * support it.
+ */
+ if (fs->super->s_creator_os == EXT2_OS_HURD)
+ fs->super->s_feature_incompat &=
+ ~EXT2_FEATURE_INCOMPAT_FILETYPE;
+
+ /*
* Set the volume label...
*/
if (volume_label) {
- memset(s->s_volume_name, 0, sizeof(s->s_volume_name));
- strncpy(s->s_volume_name, volume_label,
- sizeof(s->s_volume_name));
+ memset(fs->super->s_volume_name, 0,
+ sizeof(fs->super->s_volume_name));
+ strncpy(fs->super->s_volume_name, volume_label,
+ sizeof(fs->super->s_volume_name));
}
/*
* Set the last mount directory
*/
if (mount_dir) {
- memset(s->s_last_mounted, 0, sizeof(s->s_last_mounted));
- strncpy(s->s_last_mounted, mount_dir,
- sizeof(s->s_last_mounted));
+ memset(fs->super->s_last_mounted, 0,
+ sizeof(fs->super->s_last_mounted));
+ strncpy(fs->super->s_last_mounted, mount_dir,
+ sizeof(fs->super->s_last_mounted));
}
- if (!quiet)
+ if (!quiet || noaction)
show_stats(fs);
+ if (noaction)
+ exit(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);
- alloc_tables(fs);
+ fs->stride = fs_stride;
+ retval = ext2fs_allocate_tables(fs);
+ if (retval) {
+ com_err(program_name, retval,
+ _("while trying to allocate filesystem tables"));
+ exit(1);
+ }
if (super_only) {
fs->super->s_state |= EXT2_ERROR_FS;
fs->flags &= ~(EXT2_FLAG_IB_DIRTY|EXT2_FLAG_BB_DIRTY);
} else {
+ write_inode_tables(fs);
create_root_dir(fs);
create_lost_and_found(fs);
reserve_inodes(fs);
create_bad_block_inode(fs, bb_list);
#ifdef ZAP_BOOTBLOCK
- zap_bootblock(fs);
+ zap_sector(fs, 0);
#endif
}
+
+ journal_blocks = journal_size * 1024 / (fs->blocksize / 1024);
+ if (journal_device) {
+ if (!force)
+ check_plausibility(journal_device);
+ check_mount(journal_device, force, _("journal"));
+
+ if (!quiet)
+ printf(_("Creating journal on device %s: "),
+ journal_device);
+ retval = ext2fs_add_journal_device(fs, journal_device,
+ journal_blocks,
+ journal_flags);
+ if(retval) {
+ com_err (program_name, retval,
+ _("while trying to create journal on device %s"),
+ journal_device);
+ exit(1);
+ }
+ if (!quiet)
+ printf(_("done\n"));
+ } else if (journal_size) {
+ if (!quiet)
+ printf(_("Creating journal (%d blocks): "),
+ journal_blocks);
+ retval = ext2fs_add_journal_inode(fs, journal_blocks,
+ journal_flags);
+ if (retval) {
+ com_err (program_name, retval,
+ _("while trying to create journal"));
+ exit(1);
+ }
+ if (!quiet)
+ printf(_("done\n"));
+ }
if (!quiet)
- printf("Writing superblocks and "
- "filesystem accounting information: ");
- ext2fs_close(fs);
+ printf(_("Writing superblocks and "
+ "filesystem accounting information: "));
+ retval = ext2fs_flush(fs);
+ if (retval) {
+ printf(_("\nWarning, had trouble writing out superblocks."));
+ }
if (!quiet)
- printf("done\n");
+ printf(_("done\n"));
+ ext2fs_close(fs);
return 0;
}
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff