1997-04-26 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* mke2fs.c - Make a ext2fs filesystem.
|
|
|
|
*
|
1997-04-29 20:17:09 +04:00
|
|
|
* 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%
|
1997-04-26 17:21:57 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
/* Usage: mke2fs [options] device
|
|
|
|
*
|
|
|
|
* The device may be a block device or a image of one, but this isn't
|
|
|
|
* enforced (but it's not much fun on a character device :-).
|
|
|
|
*/
|
|
|
|
|
1997-04-26 18:00:26 +04:00
|
|
|
#include <stdio.h>
|
1997-04-26 17:21:57 +04:00
|
|
|
#include <string.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <time.h>
|
1999-09-15 00:11:19 +04:00
|
|
|
#ifdef linux
|
|
|
|
#include <sys/utsname.h>
|
|
|
|
#endif
|
1997-04-26 18:00:26 +04:00
|
|
|
#ifdef HAVE_GETOPT_H
|
1997-04-26 17:21:57 +04:00
|
|
|
#include <getopt.h>
|
Many files:
badblocks.c, dumpe2fs.c, e2label.c, mke2fs.c, tune2fs.c, uuidgen.c:
For platforms that don't define optarg.h, manually define optarg and
optind.
ChangeLog, main.c:
main.c: For platforms that don't define optarg.h, manually define
optarg and optind.
ChangeLog, unix.c:
unix.c: For platforms that don't define optarg.h, manually define
optarg and optind.
2000-04-03 20:22:35 +04:00
|
|
|
#else
|
|
|
|
extern char *optarg;
|
|
|
|
extern int optind;
|
1997-04-26 18:00:26 +04:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_UNISTD_H
|
1997-04-26 17:21:57 +04:00
|
|
|
#include <unistd.h>
|
1997-04-26 18:00:26 +04:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_STDLIB_H
|
1997-04-26 17:21:57 +04:00
|
|
|
#include <stdlib.h>
|
1997-04-26 18:00:26 +04:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_ERRNO_H
|
|
|
|
#include <errno.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_MNTENT_H
|
1997-04-26 17:21:57 +04:00
|
|
|
#include <mntent.h>
|
1997-04-26 18:00:26 +04:00
|
|
|
#endif
|
1997-04-26 17:21:57 +04:00
|
|
|
#include <sys/ioctl.h>
|
1997-04-26 17:34:30 +04:00
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
|
|
#include <linux/ext2_fs.h>
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
#include "et/com_err.h"
|
1997-04-29 18:53:37 +04:00
|
|
|
#include "uuid/uuid.h"
|
1999-10-23 05:04:50 +04:00
|
|
|
#include "e2p/e2p.h"
|
1997-04-26 17:21:57 +04:00
|
|
|
#include "ext2fs/ext2fs.h"
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-03 20:02:13 +03:00
|
|
|
#include "util.h"
|
1997-04-26 17:21:57 +04:00
|
|
|
#include "../version.h"
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
#include "nls-enable.h"
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
#define STRIDE_LENGTH 8
|
|
|
|
|
1999-11-23 05:23:30 +03:00
|
|
|
#ifndef __sparc__
|
1997-04-29 18:53:37 +04:00
|
|
|
#define ZAP_BOOTBLOCK
|
|
|
|
#endif
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
extern int isatty(int);
|
1997-04-26 17:34:30 +04:00
|
|
|
extern FILE *fpopen(const char *cmd, const char *mode);
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
const char * program_name = "mke2fs";
|
2000-12-09 17:36:04 +03:00
|
|
|
const char * device_name /* = NULL */;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
/* Command line options */
|
2001-01-16 10:47:31 +03:00
|
|
|
int cflag;
|
|
|
|
int verbose;
|
|
|
|
int quiet;
|
|
|
|
int super_only;
|
|
|
|
int force;
|
|
|
|
int noaction;
|
|
|
|
int journal_size;
|
|
|
|
int journal_flags;
|
|
|
|
char *bad_blocks_filename;
|
|
|
|
__u32 fs_stride;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
struct ext2_super_block param;
|
2001-01-16 10:47:31 +03:00
|
|
|
char *creator_os;
|
|
|
|
char *volume_label;
|
|
|
|
char *mount_dir;
|
|
|
|
char *journal_device;
|
|
|
|
int sync_kludge; /* Set using the MKE2FS_SYNC env. option */
|
1997-04-26 17:21:57 +04:00
|
|
|
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-03 20:02:13 +03:00
|
|
|
static void usage(void)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
fprintf(stderr, _("Usage: %s [-c|-t|-l filename] [-b block-size] "
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c:
tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface
so that -J is used to specify journal options, and -j is used to
request creation of a journal using default values. (This is a UI
change, but we haven't done a formal release, and it makes things much
more consistent with the rest of the options out there.)
tune2fs.c: Add support for removing a filesystem from an external
journal; we correctly remove the filesystem UUID from the external
journal's filesystem list.
2001-01-18 04:51:15 +03:00
|
|
|
"[-f fragment-size]\n\t[-i bytes-per-inode] [-j] [-J journal-options]"
|
1999-01-05 10:25:06 +03:00
|
|
|
" [-N number-of-inodes]\n\t[-m reserved-blocks-percentage] "
|
|
|
|
"[-o creator-os] [-g blocks-per-group]\n\t[-L volume-label] "
|
1999-10-23 05:22:17 +04:00
|
|
|
"[-M last-mounted-directory] [-O feature[,...]]\n\t"
|
|
|
|
"[-r fs-revision] [-R raid_opts] [-s sparse-super-flag]\n\t"
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
"[-qvSV] device [blocks-count]\n"),
|
1997-04-26 17:21:57 +04:00
|
|
|
program_name);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
1999-11-23 05:23:30 +03:00
|
|
|
static int int_log2(int arg)
|
1997-04-26 17:21:57 +04:00
|
|
|
{
|
|
|
|
int l = 0;
|
|
|
|
|
|
|
|
arg >>= 1;
|
|
|
|
while (arg) {
|
|
|
|
l++;
|
|
|
|
arg >>= 1;
|
|
|
|
}
|
|
|
|
return l;
|
|
|
|
}
|
|
|
|
|
1999-11-23 05:23:30 +03:00
|
|
|
static int int_log10(unsigned int arg)
|
ChangeLog, mke2fs.c, tune2fs.8.in:
tune2fs.8.in: Fix minor display bug in the nroff.
mke2fs.c (show_stats, write_inode_tables): Use the log10 function to
calculate the display of block numbers so that things look nice on an
80 character display.
mke2fs.c (usage): Add the sparse-super-flag to the usage message.
ChangeLog, e2fsck.c, pass1.c, pass2.c, problem.c, problem.h, unix.c:
unix.c (main): Move ext2fs_close() after e2fsck_free_context() since
e2fsck_free_context may reference data in ctx->fs.
e2fsck.c (e2fsck_reset_context): Make sure ctx->fs is non-NULL before
checking ctx->fs->dblist.
pass1.c (e2fsck_pass1): Use the device check subroutine on FIFO's and
Socket's, so that we catch bogus immutable inodes.
pass2.c (process_bad_inode): Process bad socket and fifo's.
problem.h, problem.c: Define new problem codes PR_2_BAD_FIFO and
PR_2_BAD_SOCKET.
1998-11-14 07:18:28 +03:00
|
|
|
{
|
|
|
|
int l;
|
|
|
|
|
|
|
|
for (l=0; arg ; l++)
|
|
|
|
arg = arg / 10;
|
|
|
|
return l;
|
|
|
|
}
|
|
|
|
|
1999-07-19 19:30:21 +04:00
|
|
|
/*
|
|
|
|
* This function sets the default parameters for a filesystem
|
|
|
|
*
|
1999-09-15 00:11:19 +04:00
|
|
|
* 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.
|
1999-07-19 19:30:21 +04:00
|
|
|
*/
|
|
|
|
static char default_str[] = "default";
|
|
|
|
struct mke2fs_defaults {
|
1999-10-26 18:35:51 +04:00
|
|
|
const char *type;
|
|
|
|
int size;
|
|
|
|
int blocksize;
|
|
|
|
int inode_ratio;
|
1999-07-19 19:30:21 +04:00
|
|
|
} settings[] = {
|
|
|
|
{ default_str, 0, 4096, 8192 },
|
|
|
|
{ default_str, 512, 1024, 4096 },
|
|
|
|
{ default_str, 3, 1024, 8192 },
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c:
tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface
so that -J is used to specify journal options, and -j is used to
request creation of a journal using default values. (This is a UI
change, but we haven't done a formal release, and it makes things much
more consistent with the rest of the options out there.)
tune2fs.c: Add support for removing a filesystem from an external
journal; we correctly remove the filesystem UUID from the external
journal's filesystem list.
2001-01-18 04:51:15 +03:00
|
|
|
{ "journal", 0, 4096, 8192 },
|
1999-07-19 19:30:21 +04:00
|
|
|
{ "news", 0, 4096, 4096 },
|
2001-01-14 20:02:09 +03:00
|
|
|
{ "largefile", 0, 4096, 1024 * 1024 },
|
|
|
|
{ "largefile4", 0, 4096, 4096 * 1024 },
|
1999-07-19 19:30:21 +04:00
|
|
|
{ 0, 0, 0, 0},
|
|
|
|
};
|
|
|
|
|
2001-01-01 18:31:53 +03:00
|
|
|
static void set_fs_defaults(char *fs_type, struct ext2_super_block *super,
|
1999-07-19 19:30:21 +04:00
|
|
|
int blocksize, int *inode_ratio)
|
|
|
|
{
|
|
|
|
int megs;
|
|
|
|
int ratio = 0;
|
|
|
|
struct mke2fs_defaults *p;
|
|
|
|
|
1999-10-26 20:42:50 +04:00
|
|
|
megs = (super->s_blocks_count * (EXT2_BLOCK_SIZE(super) / 1024) /
|
1999-07-19 19:30:21 +04:00
|
|
|
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) {
|
1999-10-26 20:42:50 +04:00
|
|
|
super->s_log_frag_size = super->s_log_block_size =
|
1999-11-23 05:23:30 +03:00
|
|
|
int_log2(p->blocksize >> EXT2_MIN_BLOCK_LOG_SIZE);
|
1999-07-19 19:30:21 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (blocksize == 0)
|
1999-10-26 20:42:50 +04:00
|
|
|
super->s_blocks_count /= EXT2_BLOCK_SIZE(super) / 1024;
|
1999-07-19 19:30:21 +04:00
|
|
|
}
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* Helper function for read_bb_file and test_disk
|
|
|
|
*/
|
|
|
|
static void invalid_block(ext2_filsys fs, blk_t blk)
|
|
|
|
{
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("Bad block %u out of range; ignored.\n"), blk);
|
1997-04-26 17:21:57 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Reads the bad blocks list from a file
|
|
|
|
*/
|
|
|
|
static void read_bb_file(ext2_filsys fs, badblocks_list *bb_list,
|
|
|
|
const char *bad_blocks_file)
|
|
|
|
{
|
|
|
|
FILE *f;
|
|
|
|
errcode_t retval;
|
|
|
|
|
|
|
|
f = fopen(bad_blocks_file, "r");
|
|
|
|
if (!f) {
|
|
|
|
com_err("read_bad_blocks_file", errno,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("while trying to open %s"), bad_blocks_file);
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block);
|
|
|
|
fclose (f);
|
|
|
|
if (retval) {
|
|
|
|
com_err("ext2fs_read_bb_FILE", retval,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("while reading in list of bad blocks from file"));
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Runs the badblocks program to test the disk
|
|
|
|
*/
|
|
|
|
static void test_disk(ext2_filsys fs, badblocks_list *bb_list)
|
|
|
|
{
|
|
|
|
FILE *f;
|
|
|
|
errcode_t retval;
|
|
|
|
char buf[1024];
|
|
|
|
|
1997-05-09 06:50:16 +04:00
|
|
|
sprintf(buf, "badblocks -b %d %s%s %d", fs->blocksize,
|
|
|
|
quiet ? "" : "-s ", fs->device_name,
|
1997-04-26 17:21:57 +04:00
|
|
|
fs->super->s_blocks_count);
|
|
|
|
if (verbose)
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("Running command: %s\n"), buf);
|
1997-04-26 17:21:57 +04:00
|
|
|
f = popen(buf, "r");
|
|
|
|
if (!f) {
|
|
|
|
com_err("popen", errno,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("while trying run '%s'"), buf);
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block);
|
1997-04-26 17:34:30 +04:00
|
|
|
pclose(f);
|
1997-04-26 17:21:57 +04:00
|
|
|
if (retval) {
|
|
|
|
com_err("ext2fs_read_bb_FILE", retval,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("while processing list of bad blocks from program"));
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_bad_blocks(ext2_filsys fs, badblocks_list bb_list)
|
|
|
|
{
|
1997-04-26 17:34:30 +04:00
|
|
|
int i, j;
|
1997-04-26 17:21:57 +04:00
|
|
|
int must_be_good;
|
|
|
|
blk_t blk;
|
|
|
|
badblocks_iterate bb_iter;
|
|
|
|
errcode_t retval;
|
1997-04-26 17:34:30 +04:00
|
|
|
blk_t group_block;
|
|
|
|
int group;
|
|
|
|
int group_bad;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
if (!bb_list)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The primary superblock and group descriptors *must* be
|
|
|
|
* good; if not, abort.
|
|
|
|
*/
|
|
|
|
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)) {
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
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"),
|
1997-04-26 17:21:57 +04:00
|
|
|
fs->super->s_first_data_block, must_be_good);
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
fprintf(stderr, _("Aborting....\n"));
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
1997-04-26 17:34:30 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* See if any of the bad blocks are showing up in the backup
|
|
|
|
* superblocks and/or group descriptors. If so, issue a
|
|
|
|
* warning and adjust the block counts appropriately.
|
|
|
|
*/
|
|
|
|
group_block = fs->super->s_first_data_block +
|
|
|
|
fs->super->s_blocks_per_group;
|
|
|
|
|
|
|
|
for (i = 1; i < fs->group_desc_count; i++) {
|
1998-02-17 01:29:34 +03:00
|
|
|
group_bad = 0;
|
1997-04-26 17:34:30 +04:00
|
|
|
for (j=0; j < fs->desc_blocks+1; j++) {
|
|
|
|
if (badblocks_list_test(bb_list, group_block +
|
|
|
|
j)) {
|
|
|
|
if (!group_bad)
|
|
|
|
fprintf(stderr,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("Warning: the backup superblock/group descriptors at block %d contain\n"
|
|
|
|
" bad blocks.\n\n"),
|
1997-04-26 17:34:30 +04:00
|
|
|
group_block);
|
|
|
|
group_bad++;
|
|
|
|
group = ext2fs_group_of_blk(fs, group_block+j);
|
|
|
|
fs->group_desc[group].bg_free_blocks_count++;
|
|
|
|
fs->super->s_free_blocks_count++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
group_block += fs->super->s_blocks_per_group;
|
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Mark all the bad blocks as used...
|
|
|
|
*/
|
|
|
|
retval = badblocks_list_iterate_begin(bb_list, &bb_iter);
|
|
|
|
if (retval) {
|
|
|
|
com_err("badblocks_list_iterate_begin", retval,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("while marking bad blocks as used"));
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
while (badblocks_list_iterate(bb_iter, &blk))
|
1997-04-26 17:34:30 +04:00
|
|
|
ext2fs_mark_block_bitmap(fs->block_map, blk);
|
1997-04-26 17:21:57 +04:00
|
|
|
badblocks_list_iterate_end(bb_iter);
|
|
|
|
}
|
|
|
|
|
2001-01-16 10:47:31 +03:00
|
|
|
/*
|
|
|
|
* These functions implement a generalized progress meter.
|
|
|
|
*/
|
|
|
|
struct progress_struct {
|
|
|
|
char format[20];
|
|
|
|
char backup[80];
|
|
|
|
__u32 max;
|
|
|
|
};
|
1999-02-09 11:14:28 +03:00
|
|
|
|
2001-01-16 10:47:31 +03:00
|
|
|
static void progress_init(struct progress_struct *progress,
|
|
|
|
char *label,__u32 max)
|
|
|
|
{
|
|
|
|
int i;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
2001-01-16 10:47:31 +03:00
|
|
|
memset(progress, 0, sizeof(struct progress_struct));
|
|
|
|
if (quiet)
|
|
|
|
return;
|
ChangeLog, mke2fs.c, tune2fs.8.in:
tune2fs.8.in: Fix minor display bug in the nroff.
mke2fs.c (show_stats, write_inode_tables): Use the log10 function to
calculate the display of block numbers so that things look nice on an
80 character display.
mke2fs.c (usage): Add the sparse-super-flag to the usage message.
ChangeLog, e2fsck.c, pass1.c, pass2.c, problem.c, problem.h, unix.c:
unix.c (main): Move ext2fs_close() after e2fsck_free_context() since
e2fsck_free_context may reference data in ctx->fs.
e2fsck.c (e2fsck_reset_context): Make sure ctx->fs is non-NULL before
checking ctx->fs->dblist.
pass1.c (e2fsck_pass1): Use the device check subroutine on FIFO's and
Socket's, so that we catch bogus immutable inodes.
pass2.c (process_bad_inode): Process bad socket and fifo's.
problem.h, problem.c: Define new problem codes PR_2_BAD_FIFO and
PR_2_BAD_SOCKET.
1998-11-14 07:18:28 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Figure out how many digits we need
|
|
|
|
*/
|
2001-01-16 10:47:31 +03:00
|
|
|
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 < sizeof(progress->backup))
|
|
|
|
progress->backup[(2*i)+1] = 0;
|
|
|
|
progress->max = max;
|
|
|
|
|
|
|
|
fputs(label, stdout);
|
|
|
|
fflush(stdout);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void progress_update(struct progress_struct *progress, __u32 val)
|
|
|
|
{
|
|
|
|
if (progress->format[0] == 0)
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Helper function which zeros out _num_ blocks starting at _blk_. In
|
|
|
|
* case of an error, the details of the error is returned via _ret_blk_
|
|
|
|
* and _ret_count_ if they are non-NULL pointers. Returns 0 on
|
|
|
|
* success, and an error code on an error.
|
|
|
|
*
|
|
|
|
* As a special case, if the first argument is NULL, then it will
|
|
|
|
* attempt to free the static zeroizing buffer. (This is to keep
|
|
|
|
* programs that check for memory leaks happy.)
|
|
|
|
*/
|
|
|
|
static errcode_t zero_blocks(ext2_filsys fs, blk_t blk, int num,
|
|
|
|
struct progress_struct *progress,
|
|
|
|
blk_t *ret_blk, int *ret_count)
|
|
|
|
{
|
|
|
|
int j, count, next_update, next_update_incr;
|
|
|
|
static char *buf;
|
|
|
|
errcode_t retval;
|
|
|
|
|
|
|
|
/* If fs is null, clean up the static buffer and return */
|
|
|
|
if (!fs) {
|
|
|
|
if (buf) {
|
|
|
|
free(buf);
|
|
|
|
buf = 0;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* Allocate the zeroizing buffer if necessary */
|
|
|
|
if (!buf) {
|
|
|
|
buf = malloc(fs->blocksize * STRIDE_LENGTH);
|
|
|
|
if (!buf) {
|
|
|
|
com_err("malloc", ENOMEM,
|
|
|
|
_("while allocating zeroizing buffer"));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
memset(buf, 0, fs->blocksize * STRIDE_LENGTH);
|
|
|
|
}
|
|
|
|
/* OK, do the write loop */
|
|
|
|
next_update = 0;
|
|
|
|
next_update_incr = num / 100;
|
|
|
|
if (next_update_incr < 1)
|
|
|
|
next_update_incr = 1;
|
|
|
|
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) {
|
|
|
|
if (ret_count)
|
|
|
|
*ret_count = count;
|
|
|
|
if (ret_blk)
|
|
|
|
*ret_blk = blk;
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
if (progress && j > next_update) {
|
|
|
|
next_update += num / 100;
|
|
|
|
progress_update(progress, blk);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void write_inode_tables(ext2_filsys fs)
|
|
|
|
{
|
|
|
|
errcode_t retval;
|
|
|
|
blk_t blk;
|
|
|
|
int i, num;
|
|
|
|
struct progress_struct progress;
|
|
|
|
|
|
|
|
if (quiet)
|
|
|
|
memset(&progress, 0, sizeof(progress));
|
|
|
|
else
|
|
|
|
progress_init(&progress, _("Writing inode tables: "),
|
|
|
|
fs->group_desc_count);
|
ChangeLog, mke2fs.c, tune2fs.8.in:
tune2fs.8.in: Fix minor display bug in the nroff.
mke2fs.c (show_stats, write_inode_tables): Use the log10 function to
calculate the display of block numbers so that things look nice on an
80 character display.
mke2fs.c (usage): Add the sparse-super-flag to the usage message.
ChangeLog, e2fsck.c, pass1.c, pass2.c, problem.c, problem.h, unix.c:
unix.c (main): Move ext2fs_close() after e2fsck_free_context() since
e2fsck_free_context may reference data in ctx->fs.
e2fsck.c (e2fsck_reset_context): Make sure ctx->fs is non-NULL before
checking ctx->fs->dblist.
pass1.c (e2fsck_pass1): Use the device check subroutine on FIFO's and
Socket's, so that we catch bogus immutable inodes.
pass2.c (process_bad_inode): Process bad socket and fifo's.
problem.h, problem.c: Define new problem codes PR_2_BAD_FIFO and
PR_2_BAD_SOCKET.
1998-11-14 07:18:28 +03:00
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
for (i = 0; i < fs->group_desc_count; i++) {
|
2001-01-16 10:47:31 +03:00
|
|
|
progress_update(&progress, i);
|
1997-04-26 17:21:57 +04:00
|
|
|
|
1997-04-29 20:17:09 +04:00
|
|
|
blk = fs->group_desc[i].bg_inode_table;
|
|
|
|
num = fs->inode_blocks_per_group;
|
2001-01-16 10:47:31 +03:00
|
|
|
|
|
|
|
retval = zero_blocks(fs, blk, num, 0, &blk, &num);
|
|
|
|
if (retval) {
|
|
|
|
printf(_("\nCould not write %d blocks "
|
|
|
|
"in inode table starting at %d: %s\n"),
|
|
|
|
num, blk, error_message(retval));
|
|
|
|
exit(1);
|
1997-04-29 20:17:09 +04:00
|
|
|
}
|
1999-02-09 11:14:28 +03:00
|
|
|
if (sync_kludge) {
|
|
|
|
if (sync_kludge == 1)
|
|
|
|
sync();
|
|
|
|
else if ((i % sync_kludge) == 0)
|
|
|
|
sync();
|
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
2001-01-16 10:47:31 +03:00
|
|
|
zero_blocks(0, 0, 0, 0, 0, 0);
|
|
|
|
progress_close(&progress);
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void create_root_dir(ext2_filsys fs)
|
|
|
|
{
|
|
|
|
errcode_t retval;
|
1997-04-26 17:34:30 +04:00
|
|
|
struct ext2_inode inode;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
retval = ext2fs_mkdir(fs, EXT2_ROOT_INO, EXT2_ROOT_INO, 0);
|
|
|
|
if (retval) {
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
com_err("ext2fs_mkdir", retval, _("while creating root dir"));
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
1997-04-26 17:34:30 +04:00
|
|
|
if (geteuid()) {
|
|
|
|
retval = ext2fs_read_inode(fs, EXT2_ROOT_INO, &inode);
|
|
|
|
if (retval) {
|
|
|
|
com_err("ext2fs_read_inode", retval,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("while reading root inode"));
|
1997-04-26 17:34:30 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
1997-04-29 20:17:09 +04:00
|
|
|
inode.i_uid = getuid();
|
|
|
|
if (inode.i_uid)
|
|
|
|
inode.i_gid = getgid();
|
1997-04-26 17:34:30 +04:00
|
|
|
retval = ext2fs_write_inode(fs, EXT2_ROOT_INO, &inode);
|
|
|
|
if (retval) {
|
|
|
|
com_err("ext2fs_write_inode", retval,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("while setting root inode ownership"));
|
1997-04-26 17:34:30 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void create_lost_and_found(ext2_filsys fs)
|
|
|
|
{
|
|
|
|
errcode_t retval;
|
ChangeLog, libext2fs.texinfo:
libext2fs.texinfo: Change ino_t to ext2_ino_t
ChangeLog, extent.c, main.c, resize2fs.c:
extent.c, main.c, resize2fs.c: Change ino_t to ext2_ino_t.
ChangeLog, mke2fs.c:
mke2fs.c: Change ino_t to ext2_ino_t.
ChangeLog, test_icount.c, test_rel.c:
test_icount.c, test_rel.c: Change ino_t to ext2_ino_t
2001-01-11 18:38:00 +03:00
|
|
|
ext2_ino_t ino;
|
1997-04-26 17:21:57 +04:00
|
|
|
const char *name = "lost+found";
|
|
|
|
int i;
|
1999-07-19 19:30:21 +04:00
|
|
|
int lpf_size = 0;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
retval = ext2fs_mkdir(fs, EXT2_ROOT_INO, 0, name);
|
|
|
|
if (retval) {
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
com_err("ext2fs_mkdir", retval,
|
|
|
|
_("while creating /lost+found"));
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
retval = ext2fs_lookup(fs, EXT2_ROOT_INO, name, strlen(name), 0, &ino);
|
|
|
|
if (retval) {
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
com_err("ext2_lookup", retval,
|
|
|
|
_("while looking up /lost+found"));
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i=1; i < EXT2_NDIR_BLOCKS; i++) {
|
1999-07-19 19:30:21 +04:00
|
|
|
if ((lpf_size += fs->blocksize) >= 16*1024)
|
|
|
|
break;
|
1997-04-26 17:21:57 +04:00
|
|
|
retval = ext2fs_expand_dir(fs, ino);
|
|
|
|
if (retval) {
|
|
|
|
com_err("ext2fs_expand_dir", retval,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("while expanding /lost+found"));
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void create_bad_block_inode(ext2_filsys fs, badblocks_list bb_list)
|
|
|
|
{
|
|
|
|
errcode_t retval;
|
|
|
|
|
1997-04-26 17:34:30 +04:00
|
|
|
ext2fs_mark_inode_bitmap(fs->inode_map, EXT2_BAD_INO);
|
1997-04-26 17:21:57 +04:00
|
|
|
fs->group_desc[0].bg_free_inodes_count--;
|
|
|
|
fs->super->s_free_inodes_count--;
|
|
|
|
retval = ext2fs_update_bb_inode(fs, bb_list);
|
|
|
|
if (retval) {
|
|
|
|
com_err("ext2fs_update_bb_inode", retval,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("while setting bad block inode"));
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void reserve_inodes(ext2_filsys fs)
|
|
|
|
{
|
ChangeLog, libext2fs.texinfo:
libext2fs.texinfo: Change ino_t to ext2_ino_t
ChangeLog, extent.c, main.c, resize2fs.c:
extent.c, main.c, resize2fs.c: Change ino_t to ext2_ino_t.
ChangeLog, mke2fs.c:
mke2fs.c: Change ino_t to ext2_ino_t.
ChangeLog, test_icount.c, test_rel.c:
test_icount.c, test_rel.c: Change ino_t to ext2_ino_t
2001-01-11 18:38:00 +03:00
|
|
|
ext2_ino_t i;
|
|
|
|
int group;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
1997-04-26 18:48:50 +04:00
|
|
|
for (i = EXT2_ROOT_INO + 1; i < EXT2_FIRST_INODE(fs->super); i++) {
|
1997-04-26 17:34:30 +04:00
|
|
|
ext2fs_mark_inode_bitmap(fs->inode_map, i);
|
1997-04-26 17:21:57 +04:00
|
|
|
group = ext2fs_group_of_ino(fs, i);
|
|
|
|
fs->group_desc[group].bg_free_inodes_count--;
|
|
|
|
fs->super->s_free_inodes_count--;
|
|
|
|
}
|
|
|
|
ext2fs_mark_ib_dirty(fs);
|
|
|
|
}
|
|
|
|
|
2000-08-14 18:44:15 +04:00
|
|
|
static void zap_sector(ext2_filsys fs, int sect)
|
1997-04-26 17:34:30 +04:00
|
|
|
{
|
|
|
|
char buf[512];
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
memset(buf, 0, 512);
|
|
|
|
|
2000-08-14 18:44:15 +04:00
|
|
|
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);
|
1997-04-26 17:34:30 +04:00
|
|
|
if (retval)
|
2000-10-24 22:41:44 +04:00
|
|
|
printf(_("Warning: could not erase sector %d: %s\n"), sect,
|
1997-04-26 17:34:30 +04:00
|
|
|
error_message(retval));
|
|
|
|
}
|
2001-01-16 10:47:31 +03:00
|
|
|
|
|
|
|
static void create_journal_dev(ext2_filsys fs)
|
|
|
|
{
|
|
|
|
struct progress_struct progress;
|
|
|
|
errcode_t retval;
|
|
|
|
char *buf;
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c:
tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface
so that -J is used to specify journal options, and -j is used to
request creation of a journal using default values. (This is a UI
change, but we haven't done a formal release, and it makes things much
more consistent with the rest of the options out there.)
tune2fs.c: Add support for removing a filesystem from an external
journal; we correctly remove the filesystem UUID from the external
journal's filesystem list.
2001-01-18 04:51:15 +03:00
|
|
|
blk_t blk;
|
|
|
|
int count;
|
2001-01-16 10:47:31 +03:00
|
|
|
|
|
|
|
if (quiet)
|
|
|
|
memset(&progress, 0, sizeof(progress));
|
|
|
|
else
|
|
|
|
progress_init(&progress, _("Zeroing journal device: "),
|
|
|
|
fs->super->s_blocks_count);
|
|
|
|
|
|
|
|
retval = zero_blocks(fs, 0, fs->super->s_blocks_count,
|
|
|
|
&progress, &blk, &count);
|
|
|
|
if (retval) {
|
|
|
|
com_err("create_journal_dev", retval,
|
|
|
|
"while zeroing journal device (block %u, count %d",
|
|
|
|
blk, count);
|
|
|
|
exit(1);
|
|
|
|
}
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c:
tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface
so that -J is used to specify journal options, and -j is used to
request creation of a journal using default values. (This is a UI
change, but we haven't done a formal release, and it makes things much
more consistent with the rest of the options out there.)
tune2fs.c: Add support for removing a filesystem from an external
journal; we correctly remove the filesystem UUID from the external
journal's filesystem list.
2001-01-18 04:51:15 +03:00
|
|
|
zero_blocks(0, 0, 0, 0, 0, 0);
|
|
|
|
|
2001-01-16 10:47:31 +03:00
|
|
|
retval = ext2fs_create_journal_superblock(fs,
|
|
|
|
fs->super->s_blocks_count, 0, &buf);
|
|
|
|
if (retval) {
|
|
|
|
com_err("create_journal_dev", retval,
|
|
|
|
_("while initialization journal superblock"));
|
|
|
|
exit(1);
|
|
|
|
}
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c:
tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface
so that -J is used to specify journal options, and -j is used to
request creation of a journal using default values. (This is a UI
change, but we haven't done a formal release, and it makes things much
more consistent with the rest of the options out there.)
tune2fs.c: Add support for removing a filesystem from an external
journal; we correctly remove the filesystem UUID from the external
journal's filesystem list.
2001-01-18 04:51:15 +03:00
|
|
|
retval = io_channel_write_blk(fs->io,
|
|
|
|
fs->super->s_first_data_block+1,
|
|
|
|
1, buf);
|
2001-01-16 10:47:31 +03:00
|
|
|
if (retval) {
|
|
|
|
com_err("create_journal_dev", retval,
|
|
|
|
_("while writing journal superblock"));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
progress_close(&progress);
|
|
|
|
}
|
1997-04-26 17:34:30 +04:00
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
static void show_stats(ext2_filsys fs)
|
|
|
|
{
|
2001-01-01 18:31:53 +03:00
|
|
|
struct ext2_super_block *s = fs->super;
|
1997-04-29 18:53:37 +04:00
|
|
|
char buf[80];
|
1997-04-26 17:21:57 +04:00
|
|
|
blk_t group_block;
|
ChangeLog, mke2fs.c, tune2fs.8.in:
tune2fs.8.in: Fix minor display bug in the nroff.
mke2fs.c (show_stats, write_inode_tables): Use the log10 function to
calculate the display of block numbers so that things look nice on an
80 character display.
mke2fs.c (usage): Add the sparse-super-flag to the usage message.
ChangeLog, e2fsck.c, pass1.c, pass2.c, problem.c, problem.h, unix.c:
unix.c (main): Move ext2fs_close() after e2fsck_free_context() since
e2fsck_free_context may reference data in ctx->fs.
e2fsck.c (e2fsck_reset_context): Make sure ctx->fs is non-NULL before
checking ctx->fs->dblist.
pass1.c (e2fsck_pass1): Use the device check subroutine on FIFO's and
Socket's, so that we catch bogus immutable inodes.
pass2.c (process_bad_inode): Process bad socket and fifo's.
problem.h, problem.c: Define new problem codes PR_2_BAD_FIFO and
PR_2_BAD_SOCKET.
1998-11-14 07:18:28 +03:00
|
|
|
int i, need, col_left;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
if (param.s_blocks_count != s->s_blocks_count)
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("warning: %d blocks unused.\n\n"),
|
1997-04-26 17:21:57 +04:00
|
|
|
param.s_blocks_count - s->s_blocks_count);
|
1999-07-19 19:30:21 +04:00
|
|
|
|
|
|
|
memset(buf, 0, sizeof(buf));
|
|
|
|
strncpy(buf, s->s_volume_name, sizeof(s->s_volume_name));
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("Filesystem label=%s\n"), buf);
|
|
|
|
printf(_("OS type: "));
|
1997-04-29 18:53:37 +04:00
|
|
|
switch (fs->super->s_creator_os) {
|
|
|
|
case EXT2_OS_LINUX: printf ("Linux"); break;
|
1999-10-26 05:58:54 +04:00
|
|
|
case EXT2_OS_HURD: printf ("GNU/Hurd"); break;
|
1997-04-29 18:53:37 +04:00
|
|
|
case EXT2_OS_MASIX: printf ("Masix"); break;
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
default: printf (_("(unknown os)"));
|
1997-04-29 18:53:37 +04:00
|
|
|
}
|
1999-07-19 19:30:21 +04:00
|
|
|
printf("\n");
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("Block size=%u (log=%u)\n"), fs->blocksize,
|
1999-07-19 19:30:21 +04:00
|
|
|
s->s_log_block_size);
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("Fragment size=%u (log=%u)\n"), fs->fragsize,
|
1999-07-19 19:30:21 +04:00
|
|
|
s->s_log_frag_size);
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("%u inodes, %u blocks\n"), s->s_inodes_count,
|
1997-04-26 17:21:57 +04:00
|
|
|
s->s_blocks_count);
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("%u blocks (%2.2f%%) reserved for the super user\n"),
|
1997-04-26 17:21:57 +04:00
|
|
|
s->s_r_blocks_count,
|
|
|
|
100.0 * s->s_r_blocks_count / s->s_blocks_count);
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("First data block=%u\n"), s->s_first_data_block);
|
|
|
|
if (fs->group_desc_count > 1)
|
ChangeLog, e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c:
e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c: Fix
gcc -Wall complaints, including one bug in tune2fs caused by a block
automatic shadowing version of the variable we really wanted to use,
which broke the logic testing to see if the filesystem was mounted.
ChangeLog, MCONFIG.in:
(gcc-wall-new): Added new target which forgoes the make clean so we
only check the newly modified .c files.
2001-01-11 19:08:23 +03:00
|
|
|
printf(_("%u block groups\n"), fs->group_desc_count);
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
else
|
ChangeLog, e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c:
e2image.c, mke2fs.c, mklost+found.c, tune2fs.c, util.c, uuidgen.c: Fix
gcc -Wall complaints, including one bug in tune2fs caused by a block
automatic shadowing version of the variable we really wanted to use,
which broke the logic testing to see if the filesystem was mounted.
ChangeLog, MCONFIG.in:
(gcc-wall-new): Added new target which forgoes the make clean so we
only check the newly modified .c files.
2001-01-11 19:08:23 +03:00
|
|
|
printf(_("%u block group\n"), fs->group_desc_count);
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("%u blocks per group, %u fragments per group\n"),
|
1997-04-26 17:21:57 +04:00
|
|
|
s->s_blocks_per_group, s->s_frags_per_group);
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("%u inodes per group\n"), s->s_inodes_per_group);
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
if (fs->group_desc_count == 1) {
|
|
|
|
printf("\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("Superblock backups stored on blocks: "));
|
1997-04-26 17:21:57 +04:00
|
|
|
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;
|
1997-04-29 21:48:10 +04:00
|
|
|
if (!ext2fs_bg_has_super(fs, i))
|
|
|
|
continue;
|
1999-10-20 22:06:29 +04:00
|
|
|
if (i != 1)
|
|
|
|
printf(", ");
|
1999-11-23 05:23:30 +03:00
|
|
|
need = int_log10(group_block) + 2;
|
ChangeLog, mke2fs.c, tune2fs.8.in:
tune2fs.8.in: Fix minor display bug in the nroff.
mke2fs.c (show_stats, write_inode_tables): Use the log10 function to
calculate the display of block numbers so that things look nice on an
80 character display.
mke2fs.c (usage): Add the sparse-super-flag to the usage message.
ChangeLog, e2fsck.c, pass1.c, pass2.c, problem.c, problem.h, unix.c:
unix.c (main): Move ext2fs_close() after e2fsck_free_context() since
e2fsck_free_context may reference data in ctx->fs.
e2fsck.c (e2fsck_reset_context): Make sure ctx->fs is non-NULL before
checking ctx->fs->dblist.
pass1.c (e2fsck_pass1): Use the device check subroutine on FIFO's and
Socket's, so that we catch bogus immutable inodes.
pass2.c (process_bad_inode): Process bad socket and fifo's.
problem.h, problem.c: Define new problem codes PR_2_BAD_FIFO and
PR_2_BAD_SOCKET.
1998-11-14 07:18:28 +03:00
|
|
|
if (need > col_left) {
|
1997-04-26 17:21:57 +04:00
|
|
|
printf("\n\t");
|
ChangeLog, mke2fs.c, tune2fs.8.in:
tune2fs.8.in: Fix minor display bug in the nroff.
mke2fs.c (show_stats, write_inode_tables): Use the log10 function to
calculate the display of block numbers so that things look nice on an
80 character display.
mke2fs.c (usage): Add the sparse-super-flag to the usage message.
ChangeLog, e2fsck.c, pass1.c, pass2.c, problem.c, problem.h, unix.c:
unix.c (main): Move ext2fs_close() after e2fsck_free_context() since
e2fsck_free_context may reference data in ctx->fs.
e2fsck.c (e2fsck_reset_context): Make sure ctx->fs is non-NULL before
checking ctx->fs->dblist.
pass1.c (e2fsck_pass1): Use the device check subroutine on FIFO's and
Socket's, so that we catch bogus immutable inodes.
pass2.c (process_bad_inode): Process bad socket and fifo's.
problem.h, problem.c: Define new problem codes PR_2_BAD_FIFO and
PR_2_BAD_SOCKET.
1998-11-14 07:18:28 +03:00
|
|
|
col_left = 72;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
ChangeLog, mke2fs.c, tune2fs.8.in:
tune2fs.8.in: Fix minor display bug in the nroff.
mke2fs.c (show_stats, write_inode_tables): Use the log10 function to
calculate the display of block numbers so that things look nice on an
80 character display.
mke2fs.c (usage): Add the sparse-super-flag to the usage message.
ChangeLog, e2fsck.c, pass1.c, pass2.c, problem.c, problem.h, unix.c:
unix.c (main): Move ext2fs_close() after e2fsck_free_context() since
e2fsck_free_context may reference data in ctx->fs.
e2fsck.c (e2fsck_reset_context): Make sure ctx->fs is non-NULL before
checking ctx->fs->dblist.
pass1.c (e2fsck_pass1): Use the device check subroutine on FIFO's and
Socket's, so that we catch bogus immutable inodes.
pass2.c (process_bad_inode): Process bad socket and fifo's.
problem.h, problem.c: Define new problem codes PR_2_BAD_FIFO and
PR_2_BAD_SOCKET.
1998-11-14 07:18:28 +03:00
|
|
|
col_left -= need;
|
1997-04-26 18:00:26 +04:00
|
|
|
printf("%u", group_block);
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
printf("\n\n");
|
|
|
|
}
|
|
|
|
|
1997-04-29 18:53:37 +04:00
|
|
|
/*
|
|
|
|
* Set the S_CREATOR_OS field. Return true if OS is known,
|
|
|
|
* otherwise, 0.
|
|
|
|
*/
|
|
|
|
static int set_os(struct ext2_super_block *sb, char *os)
|
|
|
|
{
|
|
|
|
if (isdigit (*os))
|
|
|
|
sb->s_creator_os = atoi (os);
|
|
|
|
else if (strcasecmp(os, "linux") == 0)
|
|
|
|
sb->s_creator_os = EXT2_OS_LINUX;
|
|
|
|
else if (strcasecmp(os, "GNU") == 0 || strcasecmp(os, "hurd") == 0)
|
|
|
|
sb->s_creator_os = EXT2_OS_HURD;
|
|
|
|
else if (strcasecmp(os, "masix") == 0)
|
|
|
|
sb->s_creator_os = EXT2_OS_MASIX;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
1997-04-26 18:00:26 +04:00
|
|
|
#define PATH_SET "PATH=/sbin"
|
|
|
|
|
1997-10-03 21:42:28 +04:00
|
|
|
static void parse_raid_opts(const char *opts)
|
1997-04-30 01:26:48 +04:00
|
|
|
{
|
|
|
|
char *buf, *token, *next, *p, *arg;
|
|
|
|
int len;
|
|
|
|
int raid_usage = 0;
|
|
|
|
|
|
|
|
len = strlen(opts);
|
|
|
|
buf = malloc(len+1);
|
|
|
|
if (!buf) {
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
fprintf(stderr, _("Couldn't allocate memory to parse "
|
|
|
|
"raid options!\n"));
|
1997-04-30 01:26:48 +04:00
|
|
|
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)) {
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
fprintf(stderr,
|
|
|
|
_("Invalid stride parameter.\n"));
|
1997-04-30 01:26:48 +04:00
|
|
|
raid_usage++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
raid_usage++;
|
|
|
|
}
|
|
|
|
if (raid_usage) {
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
fprintf(stderr, _("\nBad raid options specified.\n\n"
|
1997-04-30 01:26:48 +04:00
|
|
|
"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"
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
"\tstride=<stride length in blocks>\n\n"));
|
1997-04-30 01:26:48 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-10-23 05:04:50 +04:00
|
|
|
static __u32 ok_features[3] = {
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c:
tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface
so that -J is used to specify journal options, and -j is used to
request creation of a journal using default values. (This is a UI
change, but we haven't done a formal release, and it makes things much
more consistent with the rest of the options out there.)
tune2fs.c: Add support for removing a filesystem from an external
journal; we correctly remove the filesystem UUID from the external
journal's filesystem list.
2001-01-18 04:51:15 +03:00
|
|
|
EXT3_FEATURE_COMPAT_HAS_JOURNAL, /* Compat */
|
2001-01-16 10:47:31 +03:00
|
|
|
EXT2_FEATURE_INCOMPAT_FILETYPE| /* Incompat */
|
|
|
|
EXT3_FEATURE_INCOMPAT_JOURNAL_DEV,
|
1999-10-23 05:04:50 +04:00
|
|
|
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER /* R/O compat */
|
|
|
|
};
|
1997-04-30 01:26:48 +04:00
|
|
|
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
static void PRS(int argc, char *argv[])
|
|
|
|
{
|
1999-10-26 18:35:51 +04:00
|
|
|
int c;
|
|
|
|
int size;
|
|
|
|
char * tmp;
|
2000-08-14 19:32:11 +04:00
|
|
|
blk_t group_blk_max = 8192;
|
1999-10-26 18:35:51 +04:00
|
|
|
int blocksize = 0;
|
|
|
|
int inode_ratio = 0;
|
|
|
|
int reserved_ratio = 5;
|
ChangeLog, libext2fs.texinfo:
libext2fs.texinfo: Change ino_t to ext2_ino_t
ChangeLog, extent.c, main.c, resize2fs.c:
extent.c, main.c, resize2fs.c: Change ino_t to ext2_ino_t.
ChangeLog, mke2fs.c:
mke2fs.c: Change ino_t to ext2_ino_t.
ChangeLog, test_icount.c, test_rel.c:
test_icount.c, test_rel.c: Change ino_t to ext2_ino_t
2001-01-11 18:38:00 +03:00
|
|
|
ext2_ino_t num_inodes = 0;
|
1997-04-26 18:00:26 +04:00
|
|
|
errcode_t retval;
|
2000-10-25 07:01:37 +04:00
|
|
|
int sparse_option = 1;
|
1999-10-26 18:35:51 +04:00
|
|
|
char * oldpath = getenv("PATH");
|
|
|
|
char * raid_opts = 0;
|
|
|
|
char * fs_type = 0;
|
2000-10-25 07:01:37 +04:00
|
|
|
const char * feature_set = "filetype";
|
1999-10-26 18:35:51 +04:00
|
|
|
blk_t dev_size;
|
1999-09-15 00:11:19 +04:00
|
|
|
#ifdef linux
|
1999-10-26 18:35:51 +04:00
|
|
|
struct utsname ut;
|
1999-09-15 00:11:19 +04:00
|
|
|
|
|
|
|
if (uname(&ut)) {
|
|
|
|
perror("uname");
|
|
|
|
exit(1);
|
|
|
|
}
|
1999-10-23 05:04:50 +04:00
|
|
|
if ((ut.release[0] == '1') ||
|
|
|
|
(ut.release[0] == '2' && ut.release[1] == '.' &&
|
|
|
|
ut.release[2] < '2' && ut.release[3] == '.'))
|
2000-08-14 19:32:11 +04:00
|
|
|
feature_set = NULL;
|
1999-09-15 00:11:19 +04:00
|
|
|
#endif
|
1997-04-26 17:21:57 +04:00
|
|
|
/* Update our PATH to include /sbin */
|
1997-04-26 18:00:26 +04:00
|
|
|
if (oldpath) {
|
|
|
|
char *newpath;
|
|
|
|
|
|
|
|
newpath = malloc(sizeof (PATH_SET) + 1 + strlen (oldpath));
|
|
|
|
strcpy (newpath, PATH_SET);
|
|
|
|
strcat (newpath, ":");
|
|
|
|
strcat (newpath, oldpath);
|
|
|
|
putenv (newpath);
|
|
|
|
} else
|
|
|
|
putenv (PATH_SET);
|
1997-04-26 17:21:57 +04:00
|
|
|
|
2001-01-16 10:47:31 +03:00
|
|
|
tmp = getenv("MKE2FS_SYNC");
|
|
|
|
if (tmp)
|
|
|
|
sync_kludge = atoi(tmp);
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
setbuf(stdout, NULL);
|
|
|
|
setbuf(stderr, NULL);
|
|
|
|
initialize_ext2_error_table();
|
|
|
|
memset(¶m, 0, sizeof(struct ext2_super_block));
|
1999-07-19 19:30:21 +04:00
|
|
|
param.s_rev_level = 1; /* Create revision 1 filesystems now */
|
1997-04-26 17:21:57 +04:00
|
|
|
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
fprintf (stderr, _("mke2fs %s, %s for EXT2 FS %s, %s\n"),
|
1997-04-26 17:21:57 +04:00
|
|
|
E2FSPROGS_VERSION, E2FSPROGS_DATE,
|
|
|
|
EXT2FS_VERSION, EXT2FS_DATE);
|
|
|
|
if (argc && *argv)
|
|
|
|
program_name = *argv;
|
1997-04-29 18:53:37 +04:00
|
|
|
while ((c = getopt (argc, argv,
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c:
tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface
so that -J is used to specify journal options, and -j is used to
request creation of a journal using default values. (This is a UI
change, but we haven't done a formal release, and it makes things much
more consistent with the rest of the options out there.)
tune2fs.c: Add support for removing a filesystem from an external
journal; we correctly remove the filesystem UUID from the external
journal's filesystem list.
2001-01-18 04:51:15 +03:00
|
|
|
"b:cf:g:i:jl:m:no:qr:R:s:tvI:J:ST:FL:M:N:O:V")) != EOF)
|
1997-04-26 17:21:57 +04:00
|
|
|
switch (c) {
|
|
|
|
case 'b':
|
1999-07-19 19:30:21 +04:00
|
|
|
blocksize = strtoul(optarg, &tmp, 0);
|
|
|
|
if (blocksize < 1024 || blocksize > 4096 || *tmp) {
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
com_err(program_name, 0,
|
|
|
|
_("bad block size - %s"), optarg);
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
param.s_log_block_size =
|
1999-11-23 05:23:30 +03:00
|
|
|
int_log2(blocksize >> EXT2_MIN_BLOCK_LOG_SIZE);
|
2000-08-14 19:32:11 +04:00
|
|
|
group_blk_max = blocksize * 8;
|
1997-04-26 17:21:57 +04:00
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
case 't': /* Check for bad blocks */
|
|
|
|
cflag = 1;
|
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
size = strtoul(optarg, &tmp, 0);
|
|
|
|
if (size < 1024 || size > 4096 || *tmp) {
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
com_err(program_name, 0,
|
|
|
|
_("bad fragment size - %s"),
|
1997-04-26 17:21:57 +04:00
|
|
|
optarg);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
param.s_log_frag_size =
|
1999-11-23 05:23:30 +03:00
|
|
|
int_log2(size >> EXT2_MIN_BLOCK_LOG_SIZE);
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("Warning: fragments not supported. "
|
|
|
|
"Ignoring -f option\n"));
|
1997-04-26 17:21:57 +04:00
|
|
|
break;
|
|
|
|
case 'g':
|
|
|
|
param.s_blocks_per_group = strtoul(optarg, &tmp, 0);
|
1997-04-26 17:34:30 +04:00
|
|
|
if (*tmp) {
|
|
|
|
com_err(program_name, 0,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("Illegal number for blocks per group"));
|
1997-04-26 17:34:30 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if ((param.s_blocks_per_group % 8) != 0) {
|
|
|
|
com_err(program_name, 0,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("blocks per group must be multiple of 8"));
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'i':
|
|
|
|
inode_ratio = strtoul(optarg, &tmp, 0);
|
2001-01-14 20:02:09 +03:00
|
|
|
if (inode_ratio < 1024 || inode_ratio > 4096 * 1024 ||
|
1997-04-26 17:21:57 +04:00
|
|
|
*tmp) {
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
com_err(program_name, 0,
|
|
|
|
_("bad inode ratio - %s"), optarg);
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c:
tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface
so that -J is used to specify journal options, and -j is used to
request creation of a journal using default values. (This is a UI
change, but we haven't done a formal release, and it makes things much
more consistent with the rest of the options out there.)
tune2fs.c: Add support for removing a filesystem from an external
journal; we correctly remove the filesystem UUID from the external
journal's filesystem list.
2001-01-18 04:51:15 +03:00
|
|
|
case 'J':
|
|
|
|
parse_journal_opts(optarg);
|
|
|
|
break;
|
2000-10-24 23:33:45 +04:00
|
|
|
case 'j':
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c:
tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface
so that -J is used to specify journal options, and -j is used to
request creation of a journal using default values. (This is a UI
change, but we haven't done a formal release, and it makes things much
more consistent with the rest of the options out there.)
tune2fs.c: Add support for removing a filesystem from an external
journal; we correctly remove the filesystem UUID from the external
journal's filesystem list.
2001-01-18 04:51:15 +03:00
|
|
|
if (!journal_size)
|
|
|
|
journal_size = -1;
|
2000-11-17 07:55:24 +03:00
|
|
|
break;
|
1997-04-26 17:21:57 +04:00
|
|
|
case 'l':
|
1997-04-26 17:34:30 +04:00
|
|
|
bad_blocks_filename = malloc(strlen(optarg)+1);
|
|
|
|
if (!bad_blocks_filename) {
|
|
|
|
com_err(program_name, ENOMEM,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("in malloc for bad_blocks_filename"));
|
1997-04-26 17:34:30 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
strcpy(bad_blocks_filename, optarg);
|
1997-04-26 17:21:57 +04:00
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
reserved_ratio = strtoul(optarg, &tmp, 0);
|
|
|
|
if (reserved_ratio > 50 || *tmp) {
|
|
|
|
com_err(program_name, 0,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("bad reserved blocks percent - %s"),
|
1997-04-26 17:21:57 +04:00
|
|
|
optarg);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
1999-07-19 19:30:21 +04:00
|
|
|
case 'n':
|
|
|
|
noaction++;
|
|
|
|
break;
|
1997-04-29 18:53:37 +04:00
|
|
|
case 'o':
|
|
|
|
creator_os = optarg;
|
|
|
|
break;
|
1997-04-26 18:48:50 +04:00
|
|
|
case 'r':
|
|
|
|
param.s_rev_level = atoi(optarg);
|
|
|
|
break;
|
1997-04-29 21:48:10 +04:00
|
|
|
case 's':
|
|
|
|
sparse_option = atoi(optarg);
|
|
|
|
break;
|
1997-04-26 18:48:50 +04:00
|
|
|
#ifdef EXT2_DYNAMIC_REV
|
|
|
|
case 'I':
|
|
|
|
param.s_inode_size = atoi(optarg);
|
|
|
|
break;
|
|
|
|
#endif
|
1999-01-05 10:25:06 +03:00
|
|
|
case 'N':
|
|
|
|
num_inodes = atoi(optarg);
|
|
|
|
break;
|
1997-04-26 17:21:57 +04:00
|
|
|
case 'v':
|
|
|
|
verbose = 1;
|
|
|
|
break;
|
|
|
|
case 'q':
|
|
|
|
quiet = 1;
|
|
|
|
break;
|
1997-04-26 18:37:06 +04:00
|
|
|
case 'F':
|
|
|
|
force = 1;
|
|
|
|
break;
|
1997-04-29 18:53:37 +04:00
|
|
|
case 'L':
|
|
|
|
volume_label = optarg;
|
|
|
|
break;
|
|
|
|
case 'M':
|
|
|
|
mount_dir = optarg;
|
|
|
|
break;
|
1999-10-23 05:04:50 +04:00
|
|
|
case 'O':
|
|
|
|
feature_set = optarg;
|
|
|
|
break;
|
1997-04-30 01:26:48 +04:00
|
|
|
case 'R':
|
|
|
|
raid_opts = optarg;
|
|
|
|
break;
|
1997-04-26 17:34:30 +04:00
|
|
|
case 'S':
|
|
|
|
super_only = 1;
|
|
|
|
break;
|
1999-07-19 19:30:21 +04:00
|
|
|
case 'T':
|
|
|
|
fs_type = optarg;
|
|
|
|
break;
|
ChangeLog, debugfs.8.in, debugfs.c:
Add a -V option which displays the current version.
ChangeLog, unix.c:
unix.c (e2fsck_update_progress): Remove unused variables.
ChangeLog, inode.c:
inode.c (get_next_blockgroup): Fix bug where if get_next_blockgroup()
is called early because of a missing inode table in a block group, the
current_inode counter wasn't incremented correctly.
ChangeLog, tst_uuid.c:
tst_uuid.c (main): Fixed bogus declaration of the main's argv parameter.
ChangeLog, test_icount.c:
test_icount.c (main): Fix main() declaration so that it returns int,
not void.
Many files:
fsck.c (ignore): Remove unused variable cp.
chattr.c (fatal_error):
tune2fs.c (usage):
lsattr.c (usage):
dumpe2fs.c (usage):
badblocks.c (usage): Remove volatile from declaration.
fsck.c: Change use of strdup to be string_copy, since we don't trust
what glibc is doing with strdup. (Whatever it is, it isn't pretty.)
1998-06-27 09:11:14 +04:00
|
|
|
case 'V':
|
|
|
|
/* Print version number and exit */
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
fprintf(stderr, _("\tUsing %s\n"),
|
ChangeLog, debugfs.8.in, debugfs.c:
Add a -V option which displays the current version.
ChangeLog, unix.c:
unix.c (e2fsck_update_progress): Remove unused variables.
ChangeLog, inode.c:
inode.c (get_next_blockgroup): Fix bug where if get_next_blockgroup()
is called early because of a missing inode table in a block group, the
current_inode counter wasn't incremented correctly.
ChangeLog, tst_uuid.c:
tst_uuid.c (main): Fixed bogus declaration of the main's argv parameter.
ChangeLog, test_icount.c:
test_icount.c (main): Fix main() declaration so that it returns int,
not void.
Many files:
fsck.c (ignore): Remove unused variable cp.
chattr.c (fatal_error):
tune2fs.c (usage):
lsattr.c (usage):
dumpe2fs.c (usage):
badblocks.c (usage): Remove volatile from declaration.
fsck.c: Change use of strdup to be string_copy, since we don't trust
what glibc is doing with strdup. (Whatever it is, it isn't pretty.)
1998-06-27 09:11:14 +04:00
|
|
|
error_message(EXT2_ET_BASE));
|
|
|
|
exit(0);
|
1997-04-26 17:21:57 +04:00
|
|
|
default:
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
if (optind == argc)
|
|
|
|
usage();
|
|
|
|
device_name = argv[optind];
|
|
|
|
optind++;
|
|
|
|
if (optind < argc) {
|
2000-02-11 08:00:19 +03:00
|
|
|
unsigned long tmp2 = strtoul(argv[optind++], &tmp, 0);
|
|
|
|
|
|
|
|
if ((*tmp) || (tmp2 > 0xfffffffful)) {
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
com_err(program_name, 0, _("bad blocks count - %s"),
|
1997-04-26 17:21:57 +04:00
|
|
|
argv[optind - 1]);
|
|
|
|
exit(1);
|
|
|
|
}
|
2000-02-11 08:00:19 +03:00
|
|
|
param.s_blocks_count = tmp2;
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
if (optind < argc)
|
|
|
|
usage();
|
1997-04-26 18:00:26 +04:00
|
|
|
|
1997-04-30 01:26:48 +04:00
|
|
|
if (raid_opts)
|
|
|
|
parse_raid_opts(raid_opts);
|
|
|
|
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c:
tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface
so that -J is used to specify journal options, and -j is used to
request creation of a journal using default values. (This is a UI
change, but we haven't done a formal release, and it makes things much
more consistent with the rest of the options out there.)
tune2fs.c: Add support for removing a filesystem from an external
journal; we correctly remove the filesystem UUID from the external
journal's filesystem list.
2001-01-18 04:51:15 +03:00
|
|
|
/* Parse the user-supplied feature_set, if any. */
|
|
|
|
if (feature_set && !strncasecmp(feature_set, "none", 4))
|
|
|
|
feature_set = NULL;
|
|
|
|
if (feature_set && e2p_edit_feature(feature_set,
|
|
|
|
¶m.s_feature_compat,
|
|
|
|
ok_features)) {
|
|
|
|
fprintf(stderr, _("Invalid filesystem option set: %s\n"),
|
|
|
|
feature_set);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
1997-04-26 18:37:06 +04:00
|
|
|
if (!force)
|
2000-11-17 07:55:24 +03:00
|
|
|
check_plausibility(device_name);
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-03 20:02:13 +03:00
|
|
|
check_mount(device_name, force, _("filesystem"));
|
1997-04-26 18:00:26 +04:00
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
param.s_log_frag_size = param.s_log_block_size;
|
|
|
|
|
1999-07-19 19:30:21 +04:00
|
|
|
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),
|
|
|
|
&dev_size);
|
1998-03-30 05:20:55 +04:00
|
|
|
if (retval && (retval != EXT2_ET_UNIMPLEMENTED)) {
|
|
|
|
com_err(program_name, retval,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("while trying to determine filesystem size"));
|
1998-03-30 05:20:55 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
1997-04-26 18:00:26 +04:00
|
|
|
if (!param.s_blocks_count) {
|
1998-03-30 05:20:55 +04:00
|
|
|
if (retval == EXT2_ET_UNIMPLEMENTED) {
|
|
|
|
com_err(program_name, 0,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("Couldn't determine device size; you "
|
1998-03-30 05:20:55 +04:00
|
|
|
"must specify\nthe size of the "
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
"filesystem\n"));
|
1997-04-26 18:00:26 +04:00
|
|
|
exit(1);
|
2000-05-29 19:05:42 +04:00
|
|
|
} 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);
|
|
|
|
}
|
1998-03-30 05:20:55 +04:00
|
|
|
param.s_blocks_count = dev_size;
|
2000-05-29 19:05:42 +04:00
|
|
|
}
|
|
|
|
|
1998-03-30 05:20:55 +04:00
|
|
|
} else if (!force && (param.s_blocks_count > dev_size)) {
|
|
|
|
com_err(program_name, 0,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("Filesystem larger than apparent filesystem size."));
|
1998-03-30 05:20:55 +04:00
|
|
|
proceed_question();
|
1997-04-26 18:00:26 +04:00
|
|
|
}
|
1997-04-26 17:21:57 +04:00
|
|
|
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c:
tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface
so that -J is used to specify journal options, and -j is used to
request creation of a journal using default values. (This is a UI
change, but we haven't done a formal release, and it makes things much
more consistent with the rest of the options out there.)
tune2fs.c: Add support for removing a filesystem from an external
journal; we correctly remove the filesystem UUID from the external
journal's filesystem list.
2001-01-18 04:51:15 +03:00
|
|
|
/*
|
|
|
|
* If the user asked for HAS_JOURNAL, then make sure a journal
|
|
|
|
* gets created.
|
|
|
|
*/
|
|
|
|
if ((param.s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) &&
|
|
|
|
!journal_size)
|
|
|
|
journal_size = -1;
|
|
|
|
if (!fs_type &&
|
|
|
|
(param.s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV))
|
|
|
|
fs_type = "journal";
|
|
|
|
set_fs_defaults(fs_type, ¶m, blocksize, &inode_ratio);
|
1999-07-19 19:30:21 +04:00
|
|
|
|
1997-04-29 21:48:10 +04:00
|
|
|
if (param.s_blocks_per_group) {
|
|
|
|
if (param.s_blocks_per_group < 256 ||
|
2000-08-14 19:32:11 +04:00
|
|
|
param.s_blocks_per_group > group_blk_max || *tmp) {
|
1997-04-29 21:48:10 +04:00
|
|
|
com_err(program_name, 0,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("blocks per group count out of range"));
|
1997-04-29 21:48:10 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
/*
|
|
|
|
* Calculate number of inodes based on the inode ratio
|
|
|
|
*/
|
1999-01-05 10:25:06 +03:00
|
|
|
param.s_inodes_count = num_inodes ? num_inodes :
|
1999-10-26 06:30:16 +04:00
|
|
|
((__u64) param.s_blocks_count * EXT2_BLOCK_SIZE(¶m))
|
1997-04-26 17:34:30 +04:00
|
|
|
/ inode_ratio;
|
1997-04-26 17:21:57 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Calculate number of blocks to reserve
|
|
|
|
*/
|
|
|
|
param.s_r_blocks_count = (param.s_blocks_count * reserved_ratio) / 100;
|
1997-04-29 21:48:10 +04:00
|
|
|
|
2000-10-25 07:01:37 +04:00
|
|
|
/* Turn off features not supported by the earlier filesystem version */
|
|
|
|
if (param.s_rev_level == 0) {
|
|
|
|
sparse_option = 0;
|
|
|
|
feature_set = NULL;
|
|
|
|
}
|
1999-09-15 00:11:19 +04:00
|
|
|
if (sparse_option)
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c:
tune2fs.c, mke2fs.c, tune2fs.8.in, mke2fs.8.in: Change user interface
so that -J is used to specify journal options, and -j is used to
request creation of a journal using default values. (This is a UI
change, but we haven't done a formal release, and it makes things much
more consistent with the rest of the options out there.)
tune2fs.c: Add support for removing a filesystem from an external
journal; we correctly remove the filesystem UUID from the external
journal's filesystem list.
2001-01-18 04:51:15 +03:00
|
|
|
param.s_feature_ro_compat |=
|
1997-04-29 21:48:10 +04:00
|
|
|
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
|
2000-10-25 07:01:37 +04:00
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
int main (int argc, char *argv[])
|
|
|
|
{
|
|
|
|
errcode_t retval = 0;
|
|
|
|
ext2_filsys fs;
|
|
|
|
badblocks_list bb_list = 0;
|
2000-10-24 23:33:45 +04:00
|
|
|
int journal_blocks;
|
2001-01-14 20:02:09 +03:00
|
|
|
int i, val;
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
|
|
|
|
#ifdef ENABLE_NLS
|
|
|
|
setlocale(LC_MESSAGES, "");
|
|
|
|
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
|
|
|
|
textdomain(NLS_CAT_NAME);
|
|
|
|
#endif
|
1997-04-26 17:21:57 +04:00
|
|
|
PRS(argc, argv);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize the superblock....
|
|
|
|
*/
|
|
|
|
retval = ext2fs_initialize(device_name, 0, ¶m,
|
|
|
|
unix_io_manager, &fs);
|
|
|
|
if (retval) {
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
com_err(device_name, retval, _("while setting up superblock"));
|
1997-04-26 17:21:57 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2000-08-14 18:44:15 +04:00
|
|
|
/*
|
|
|
|
* Wipe out the old on-disk superblock
|
|
|
|
*/
|
|
|
|
zap_sector(fs, 2);
|
|
|
|
|
1997-04-29 18:53:37 +04:00
|
|
|
/*
|
|
|
|
* Generate a UUID for it...
|
|
|
|
*/
|
2001-01-01 18:31:53 +03:00
|
|
|
uuid_generate(fs->super->s_uuid);
|
1997-04-29 18:53:37 +04:00
|
|
|
|
2001-01-14 20:02:09 +03:00
|
|
|
/*
|
|
|
|
* Add "jitter" to the superblock's check interval so that we
|
|
|
|
* don't check all the filesystems at the same time. We use a
|
|
|
|
* kludgy hack of using the UUID to derive a random jitter value.
|
|
|
|
*/
|
|
|
|
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;
|
|
|
|
|
1997-04-29 18:53:37 +04:00
|
|
|
/*
|
|
|
|
* Override the creator OS, if applicable
|
|
|
|
*/
|
|
|
|
if (creator_os && !set_os(fs->super, creator_os)) {
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
com_err (program_name, 0, _("unknown os - %s"), creator_os);
|
1997-04-29 18:53:37 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
ChangeLog, problem.c, problem.h, super.c:
problem.c, problem.h (PR_0_HURD_CLEAR_FILETYPE): Add new problem code.
super.c (check_super_block): If the OS type in the superblock is the
Hurd, check to see if the filetype feature is set, and offer to clear
it if so. This needs to be done since the Hurd doesn't properly
support the filetype feature. (And since the hurd allows the
transmogrification of files to special files and vice versa --- for no
good reason that I can understand --- it can't support the filetype
feature for the forseeable future, either.)
ChangeLog, mke2fs.c:
mke2fs.c (main): We forcibly turn off the filetype feature if the OS
is the hurd, since the hurd doesn't support it. (And since the hurd
allows the transmogrification of files to special files and vice versa
--- for no good reason that I can understand --- it can't support the
filetype feature for the forseeable future, either.)
mke2fs.c (proceed_question): Fix reversed sense of proceed_question
that was busted due to the internationalization patch. Fixed bug
where if proceed_question was called twice, the input buffer wasn't
cleared of the previous question's newline.
ChangeLog, expect.1, expect.2, image.gz, name:
f_hurd: Add test for Hurd-specific features (right now, just checks to
make sure the filetype feature is cleared)
ChangeLog, ls.c:
ls.c (list_super): Change the string displayed for the Hurd to be
GNU/Hurd, instead of just "GNU".
2000-05-08 17:33:17 +04:00
|
|
|
/*
|
|
|
|
* 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;
|
|
|
|
|
1997-04-29 18:53:37 +04:00
|
|
|
/*
|
|
|
|
* Set the volume label...
|
|
|
|
*/
|
|
|
|
if (volume_label) {
|
2001-01-01 18:31:53 +03:00
|
|
|
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));
|
1997-04-29 18:53:37 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set the last mount directory
|
|
|
|
*/
|
|
|
|
if (mount_dir) {
|
2001-01-01 18:31:53 +03:00
|
|
|
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));
|
1997-04-29 18:53:37 +04:00
|
|
|
}
|
|
|
|
|
1999-07-19 19:30:21 +04:00
|
|
|
if (!quiet || noaction)
|
1997-04-26 17:21:57 +04:00
|
|
|
show_stats(fs);
|
|
|
|
|
1999-07-19 19:30:21 +04:00
|
|
|
if (noaction)
|
|
|
|
exit(0);
|
|
|
|
|
2001-01-16 10:47:31 +03:00
|
|
|
if (fs->super->s_feature_incompat &
|
|
|
|
EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) {
|
|
|
|
create_journal_dev(fs);
|
|
|
|
ext2fs_close(fs);
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
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);
|
1997-04-30 01:26:48 +04:00
|
|
|
fs->stride = fs_stride;
|
1997-04-29 20:17:09 +04:00
|
|
|
retval = ext2fs_allocate_tables(fs);
|
|
|
|
if (retval) {
|
|
|
|
com_err(program_name, retval,
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
_("while trying to allocate filesystem tables"));
|
1997-04-29 20:17:09 +04:00
|
|
|
exit(1);
|
|
|
|
}
|
1997-04-26 17:34:30 +04:00
|
|
|
if (super_only) {
|
|
|
|
fs->super->s_state |= EXT2_ERROR_FS;
|
|
|
|
fs->flags &= ~(EXT2_FLAG_IB_DIRTY|EXT2_FLAG_BB_DIRTY);
|
|
|
|
} else {
|
1997-04-29 20:17:09 +04:00
|
|
|
write_inode_tables(fs);
|
1997-04-26 17:34:30 +04:00
|
|
|
create_root_dir(fs);
|
|
|
|
create_lost_and_found(fs);
|
|
|
|
reserve_inodes(fs);
|
|
|
|
create_bad_block_inode(fs, bb_list);
|
1997-04-29 18:53:37 +04:00
|
|
|
#ifdef ZAP_BOOTBLOCK
|
2000-08-14 18:44:15 +04:00
|
|
|
zap_sector(fs, 0);
|
1997-04-29 18:53:37 +04:00
|
|
|
#endif
|
1997-04-26 17:34:30 +04:00
|
|
|
}
|
2000-11-17 07:55:24 +03:00
|
|
|
|
2001-01-16 10:47:31 +03:00
|
|
|
if (journal_device) {
|
|
|
|
ext2_filsys jfs;
|
|
|
|
|
2000-11-17 07:55:24 +03:00
|
|
|
if (!force)
|
|
|
|
check_plausibility(journal_device);
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-03 20:02:13 +03:00
|
|
|
check_mount(journal_device, force, _("journal"));
|
2000-11-17 07:55:24 +03:00
|
|
|
|
2001-01-16 10:47:31 +03:00
|
|
|
retval = ext2fs_open(journal_device, EXT2_FLAG_RW|
|
|
|
|
EXT2_FLAG_JOURNAL_DEV_OK, 0,
|
|
|
|
fs->blocksize, unix_io_manager, &jfs);
|
|
|
|
if (retval) {
|
|
|
|
com_err(program_name, retval,
|
|
|
|
_("while trying to open journal device %s\n"),
|
|
|
|
journal_device);
|
|
|
|
exit(1);
|
|
|
|
}
|
2001-02-17 09:09:50 +03:00
|
|
|
if (!quiet) {
|
2000-11-17 07:55:24 +03:00
|
|
|
printf(_("Creating journal on device %s: "),
|
|
|
|
journal_device);
|
2001-02-17 09:09:50 +03:00
|
|
|
fflush(stdout);
|
|
|
|
}
|
2001-01-16 10:47:31 +03:00
|
|
|
retval = ext2fs_add_journal_device(fs, jfs);
|
|
|
|
if(retval) {
|
2000-11-17 07:55:24 +03:00
|
|
|
com_err (program_name, retval,
|
2001-01-16 10:47:31 +03:00
|
|
|
_("while trying to add journal to device %s"),
|
2000-11-17 07:55:24 +03:00
|
|
|
journal_device);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (!quiet)
|
|
|
|
printf(_("done\n"));
|
2001-01-16 10:47:31 +03:00
|
|
|
ext2fs_close(jfs);
|
2000-11-17 07:55:24 +03:00
|
|
|
} else if (journal_size) {
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
ke2fs.8.in, tune2fs.8.in: Change man paegs to document that the
journal must be bewteen 1024 and 10,240 file system blocks.
mke2fs.c, tune2fs.c: Change to use figure_journal_size()
util.c, util.h (figure_journal_size): Change journal_default_size into
routine which also converts the requested journal size into filesystem
blocks and does bounds checking to make sure the journal is sized
reasonably. Renamed function to journal_default_size.
parse_journal_opts): Remove bounds check for the journal size, since
this is now done in figure_journal_size, and based on the number of
filesystem blocks, as opposed to using the absolute size of the
journal.
2001-03-27 00:07:13 +04:00
|
|
|
journal_blocks = figure_journal_size(journal_size, fs);
|
2001-02-17 09:09:50 +03:00
|
|
|
|
|
|
|
if (!journal_blocks) {
|
|
|
|
fs->super->s_feature_compat &=
|
|
|
|
~EXT3_FEATURE_COMPAT_HAS_JOURNAL;
|
|
|
|
goto no_journal;
|
|
|
|
}
|
|
|
|
if (!quiet) {
|
2000-12-31 06:21:56 +03:00
|
|
|
printf(_("Creating journal (%d blocks): "),
|
|
|
|
journal_blocks);
|
2001-02-17 09:09:50 +03:00
|
|
|
fflush(stdout);
|
|
|
|
}
|
ChangeLog, Makefile.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
tune2fs.c (update_feature_set, add_journal): Moved to separate
functions. Added ability to add and remove the journal while the
filesystem is live. Added support for setting a time-based UUID.
Removed zero-initialized static variables.
mke2fs.c, util.c, util.h (strcasecmp, proceed_question,
check_plausibility, parse_journal_opts, check_mount): Moved functions
to util.c so they can be used by tune2fs.
mke2fs.c (main): Change ext2fs_add_journal_fs() to
ext2fs_add_journal_inode() to reflect function renaming.
2001-01-03 20:02:13 +03:00
|
|
|
retval = ext2fs_add_journal_inode(fs, journal_blocks,
|
|
|
|
journal_flags);
|
2000-10-24 23:33:45 +04:00
|
|
|
if (retval) {
|
|
|
|
com_err (program_name, retval,
|
|
|
|
_("while trying to create journal"));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (!quiet)
|
|
|
|
printf(_("done\n"));
|
|
|
|
}
|
2001-02-17 09:09:50 +03:00
|
|
|
no_journal:
|
|
|
|
|
1997-04-26 17:21:57 +04:00
|
|
|
if (!quiet)
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("Writing superblocks and "
|
|
|
|
"filesystem accounting information: "));
|
1999-03-16 22:35:19 +03:00
|
|
|
retval = ext2fs_flush(fs);
|
|
|
|
if (retval) {
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2label.c, findsuper.c, fsck.c,
get_device_by_label.c, lsattr.c, mke2fs.c, mklost+found.c,
nls-enable.h, partinfo.c, tune2fs.c, uuidgen.c: Add
Internationalization support as suggested by Marco d'Itri
<md@linux.it>.
2000-02-08 03:47:55 +03:00
|
|
|
printf(_("\nWarning, had trouble writing out superblocks."));
|
1999-03-16 22:35:19 +03:00
|
|
|
}
|
2001-02-17 09:09:50 +03:00
|
|
|
if (!quiet) {
|
ChangeLog, mke2fs.8.in, mke2fs.c, tune2fs.8.in, tune2fs.c, util.c, util.h:
ke2fs.8.in, tune2fs.8.in: Change man paegs to document that the
journal must be bewteen 1024 and 10,240 file system blocks.
mke2fs.c, tune2fs.c: Change to use figure_journal_size()
util.c, util.h (figure_journal_size): Change journal_default_size into
routine which also converts the requested journal size into filesystem
blocks and does bounds checking to make sure the journal is sized
reasonably. Renamed function to journal_default_size.
parse_journal_opts): Remove bounds check for the journal size, since
this is now done in figure_journal_size, and based on the number of
filesystem blocks, as opposed to using the absolute size of the
journal.
2001-03-27 00:07:13 +04:00
|
|
|
printf(_("done\n\n"));
|
|
|
|
printf(_("Filesystem will be checked run "
|
|
|
|
"every %d mounts or %g days.\n"),
|
2001-02-17 09:09:50 +03:00
|
|
|
fs->super->s_max_mnt_count,
|
|
|
|
(double)fs->super->s_checkinterval / (3600 * 24));
|
|
|
|
}
|
1999-03-16 22:35:19 +03:00
|
|
|
ext2fs_close(fs);
|
1997-04-26 17:21:57 +04:00
|
|
|
return 0;
|
|
|
|
}
|