1997-04-26 21:21:57 +08:00
|
|
|
/*
|
2001-04-24 04:58:03 +08:00
|
|
|
* tune2fs.c - Change the file system parameters on an ext2 file system
|
1997-04-26 21:21:57 +08:00
|
|
|
*
|
|
|
|
* Copyright (C) 1992, 1993, 1994 Remy Card <card@masi.ibp.fr>
|
|
|
|
* Laboratoire MASI, Institut Blaise Pascal
|
|
|
|
* Universite Pierre et Marie Curie (Paris VI)
|
|
|
|
*
|
2001-04-24 04:58:03 +08:00
|
|
|
* Copyright 1995, 1996, 1997, 1998, 1999, 2000 by Theodore Ts'o.
|
1997-04-30 00:17:09 +08:00
|
|
|
*
|
|
|
|
* %Begin-Header%
|
|
|
|
* This file may be redistributed under the terms of the GNU Public
|
|
|
|
* License.
|
|
|
|
* %End-Header%
|
1997-04-26 21:21:57 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* History:
|
|
|
|
* 93/06/01 - Creation
|
|
|
|
* 93/10/31 - Added the -c option to change the maximal mount counts
|
|
|
|
* 93/12/14 - Added -l flag to list contents of superblock
|
|
|
|
* M.J.E. Mol (marcel@duteca.et.tudelft.nl)
|
|
|
|
* F.W. ten Wolde (franky@duteca.et.tudelft.nl)
|
|
|
|
* 93/12/29 - Added the -e option to change errors behavior
|
|
|
|
* 94/02/27 - Ported to use the ext2fs library
|
|
|
|
* 94/03/06 - Added the checks interval from Uwe Ohse (uwe@tirka.gun.de)
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <fcntl.h>
|
1997-04-26 21:34:30 +08:00
|
|
|
#include <grp.h>
|
1997-04-26 22:00:26 +08:00
|
|
|
#ifdef HAVE_GETOPT_H
|
1997-04-26 21:21:57 +08: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-04 00:22:35 +08:00
|
|
|
#else
|
|
|
|
extern char *optarg;
|
|
|
|
extern int optind;
|
1997-04-26 22:00:26 +08:00
|
|
|
#endif
|
1997-04-26 21:34:30 +08:00
|
|
|
#include <pwd.h>
|
1997-04-26 21:21:57 +08:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <unistd.h>
|
1997-04-26 21:34:30 +08:00
|
|
|
#include <sys/types.h>
|
1997-04-26 21:21:57 +08:00
|
|
|
|
Many files:
badblocks.c, chattr.c, dumpe2fs.c, e2image.c, findsuper.c, lsattr.c,
mke2fs.c, mklost+found.c, tune2fs.c, util.c: Change location of
ext2_fs.h to be ext2fs/ext2_fs.h
ChangeLog, Makefile.in, resize2fs.h:
resize2fs.h: Change location of ext2_fs.h to be ext2fs/ext2_fs.h
ChangeLog, Makefile.in, debugfs.h:
debugfs.h: Change location of ext2_fs.h to be ext2fs/ext2_fs.h
ChangeLog, Makefile.in, e2fsck.h, scantest.c:
e2fsck.h, scantest.c: Change location of ext2_fs.h to be
ext2fs/ext2_fs.h
ChangeLog, Makefile.in, tst_uuid.c, uuid_time.c:
tst_uuid.c, uuid_time.c: Remove unneeded #include of ext2_fs.h
ChangeLog, Makefile.in, e2p.h:
e2p.h: Change location of ext2_fs.h to be ext2fs/ext2_fs.h
ChangeLog, Makefile.in, test_icount.c, test_rel.c:
test_icount.c, test_rel.c: Change location of ext2_fs.h to be
ext2fs/ext2_fs.h
2001-05-14 19:45:38 +08:00
|
|
|
#include "ext2fs/ext2_fs.h"
|
1997-04-26 21:21:57 +08:00
|
|
|
#include "ext2fs/ext2fs.h"
|
|
|
|
#include "et/com_err.h"
|
1997-04-29 22:53:37 +08:00
|
|
|
#include "uuid/uuid.h"
|
1997-04-26 21:21:57 +08:00
|
|
|
#include "e2p/e2p.h"
|
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 09:51:15 +08:00
|
|
|
#include "jfs_user.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-04 01:02:13 +08:00
|
|
|
#include "util.h"
|
1997-04-26 21:21:57 +08: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 08:47:55 +08:00
|
|
|
#include "nls-enable.h"
|
1997-04-26 21:21:57 +08:00
|
|
|
|
|
|
|
const char * program_name = "tune2fs";
|
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-04 01:02:13 +08:00
|
|
|
char * device_name;
|
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-12 00:08:23 +08:00
|
|
|
char * new_label, *new_last_mounted, *new_UUID;
|
2001-04-24 04:58:03 +08:00
|
|
|
static int c_flag, C_flag, e_flag, f_flag, g_flag, i_flag, l_flag, L_flag;
|
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-04 01:02:13 +08:00
|
|
|
static int m_flag, M_flag, r_flag, s_flag = -1, u_flag, U_flag;
|
2001-01-09 08:16:26 +08:00
|
|
|
static int print_label;
|
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-04 01:02:13 +08:00
|
|
|
static int max_mount_count, mount_count, mount_flags;
|
|
|
|
static unsigned long interval, reserved_ratio, reserved_blocks;
|
|
|
|
static unsigned long resgid, resuid;
|
|
|
|
static unsigned short errors;
|
2001-01-09 08:16:26 +08:00
|
|
|
static int open_flag;
|
|
|
|
static char *features_cmd;
|
1997-04-26 21:21:57 +08: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-04 01:02:13 +08:00
|
|
|
int journal_size, journal_flags;
|
|
|
|
char *journal_device;
|
|
|
|
|
|
|
|
static const char *please_fsck = N_("Please run e2fsck on the filesystem.\n");
|
1997-04-29 22:53:37 +08:00
|
|
|
|
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 13:11:14 +08:00
|
|
|
static void usage(void)
|
1997-04-26 21:21:57 +08:00
|
|
|
{
|
2001-01-01 23:26:58 +08:00
|
|
|
fprintf(stderr,
|
|
|
|
_("Usage: %s [-c max-mounts-count] [-e errors-behavior] "
|
|
|
|
"[-g group]\n"
|
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 09:51:15 +08:00
|
|
|
"\t[-i interval[d|m|w]] [-j] [-J journal-options]\n"
|
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-04 01:02:13 +08:00
|
|
|
"\t[-l] [-s sparse-flag] [-m reserved-blocks-percent]\n"
|
2001-01-01 23:26:58 +08:00
|
|
|
"\t[-r reserved-blocks-count] [-u user] [-C mount-count]\n"
|
|
|
|
"\t[-L volume-label] [-M last-mounted-dir] [-U UUID]\n"
|
|
|
|
"\t[-O [^]feature[,...]] device\n"), program_name);
|
1997-04-26 21:21:57 +08:00
|
|
|
exit (1);
|
|
|
|
}
|
|
|
|
|
1999-10-23 09:04:50 +08:00
|
|
|
static __u32 ok_features[3] = {
|
2001-01-01 23:26:58 +08:00
|
|
|
EXT3_FEATURE_COMPAT_HAS_JOURNAL, /* Compat */
|
1999-10-23 09:04:50 +08:00
|
|
|
EXT2_FEATURE_INCOMPAT_FILETYPE, /* Incompat */
|
|
|
|
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER /* R/O compat */
|
|
|
|
};
|
|
|
|
|
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 09:51:15 +08:00
|
|
|
/*
|
|
|
|
* Remove an external journal from the filesystem
|
|
|
|
*/
|
|
|
|
static void remove_journal_device(ext2_filsys fs)
|
|
|
|
{
|
|
|
|
char *journal_device;
|
|
|
|
ext2_filsys jfs;
|
|
|
|
char buf[1024];
|
|
|
|
journal_superblock_t *jsb;
|
|
|
|
int i, nr_users;
|
|
|
|
errcode_t retval;
|
2001-04-24 04:58:03 +08:00
|
|
|
int commit_remove_journal = 0;
|
|
|
|
|
|
|
|
if (f_flag)
|
|
|
|
commit_remove_journal = 1; /* force removal even if error */
|
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 09:51:15 +08:00
|
|
|
|
|
|
|
journal_device = ext2fs_find_block_device(fs->super->s_journal_dev);
|
|
|
|
if (!journal_device)
|
|
|
|
return;
|
|
|
|
|
|
|
|
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 external journal"));
|
2001-04-24 04:58:03 +08:00
|
|
|
goto no_valid_journal;
|
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 09:51:15 +08:00
|
|
|
}
|
|
|
|
if (!(jfs->super->s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)) {
|
|
|
|
fprintf(stderr, "%s is not a journal device.\n",
|
|
|
|
journal_device);
|
2001-04-24 04:58:03 +08:00
|
|
|
goto no_valid_journal;
|
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 09:51:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the journal superblock */
|
|
|
|
if ((retval = io_channel_read_blk(jfs->io, 1, -1024, buf))) {
|
|
|
|
com_err(program_name, retval,
|
|
|
|
_("while reading journal superblock"));
|
2001-04-24 04:58:03 +08:00
|
|
|
goto no_valid_journal;
|
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 09:51:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
jsb = (journal_superblock_t *) buf;
|
|
|
|
if ((jsb->s_header.h_magic != (unsigned) ntohl(JFS_MAGIC_NUMBER)) ||
|
|
|
|
(jsb->s_header.h_blocktype != (unsigned) ntohl(JFS_SUPERBLOCK_V2))) {
|
|
|
|
fprintf(stderr, _("Journal superblock not found!\n"));
|
2001-04-24 04:58:03 +08:00
|
|
|
goto no_valid_journal;
|
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 09:51:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Find the filesystem UUID */
|
|
|
|
nr_users = ntohl(jsb->s_nr_users);
|
|
|
|
for (i=0; i < nr_users; i++) {
|
|
|
|
if (memcmp(fs->super->s_uuid,
|
|
|
|
&jsb->s_users[i*16], 16) == 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (i >= nr_users) {
|
|
|
|
fprintf(stderr, "Filesystem's UUID not found on journal device.\n");
|
2001-04-24 04:58:03 +08:00
|
|
|
commit_remove_journal = 1;
|
|
|
|
goto no_valid_journal;
|
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 09:51:15 +08:00
|
|
|
}
|
|
|
|
nr_users--;
|
|
|
|
for (i=0; i < nr_users; i++)
|
|
|
|
memcpy(&jsb->s_users[i*16], &jsb->s_users[(i+1)*16], 16);
|
|
|
|
jsb->s_nr_users = htonl(nr_users);
|
|
|
|
|
|
|
|
/* Write back the journal superblock */
|
|
|
|
if ((retval = io_channel_write_blk(jfs->io, 1, -1024, buf))) {
|
|
|
|
com_err(program_name, retval,
|
|
|
|
"while writing journal superblock.");
|
2001-04-24 04:58:03 +08:00
|
|
|
goto no_valid_journal;
|
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 09:51:15 +08:00
|
|
|
}
|
|
|
|
|
2001-04-24 04:58:03 +08:00
|
|
|
commit_remove_journal = 1;
|
|
|
|
|
|
|
|
no_valid_journal:
|
|
|
|
if (commit_remove_journal == 0) {
|
|
|
|
printf(_("Journal NOT removed\n"));
|
|
|
|
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 09:51:15 +08:00
|
|
|
fs->super->s_journal_dev = 0;
|
|
|
|
memset(fs->super->s_journal_uuid, 0,
|
|
|
|
sizeof(fs->super->s_journal_uuid));
|
|
|
|
ext2fs_mark_super_dirty(fs);
|
2001-04-24 04:58:03 +08:00
|
|
|
printf(_("Journal removed\n"));
|
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 09:51:15 +08: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-04 01:02:13 +08:00
|
|
|
/*
|
|
|
|
* Update the feature set as provided by the user.
|
|
|
|
*/
|
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-12 00:08:23 +08:00
|
|
|
static void update_feature_set(ext2_filsys fs, char *features)
|
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-04 01:02:13 +08:00
|
|
|
{
|
|
|
|
int sparse, old_sparse, filetype, old_filetype;
|
|
|
|
int journal, old_journal;
|
|
|
|
struct ext2_inode inode;
|
|
|
|
struct ext2_super_block *sb= fs->super;
|
|
|
|
errcode_t retval;
|
|
|
|
|
|
|
|
old_sparse = sb->s_feature_ro_compat &
|
|
|
|
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
|
|
|
|
old_filetype = sb->s_feature_incompat &
|
|
|
|
EXT2_FEATURE_INCOMPAT_FILETYPE;
|
|
|
|
old_journal = sb->s_feature_compat &
|
|
|
|
EXT3_FEATURE_COMPAT_HAS_JOURNAL;
|
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-12 00:08:23 +08:00
|
|
|
if (e2p_edit_feature(features, &sb->s_feature_compat,
|
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-04 01:02:13 +08:00
|
|
|
ok_features)) {
|
|
|
|
fprintf(stderr, _("Invalid filesystem option set: %s\n"),
|
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-12 00:08:23 +08:00
|
|
|
features);
|
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-04 01:02:13 +08:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
sparse = sb->s_feature_ro_compat &
|
|
|
|
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
|
|
|
|
filetype = sb->s_feature_incompat &
|
|
|
|
EXT2_FEATURE_INCOMPAT_FILETYPE;
|
|
|
|
journal = sb->s_feature_compat &
|
|
|
|
EXT3_FEATURE_COMPAT_HAS_JOURNAL;
|
|
|
|
if (old_journal && !journal) {
|
|
|
|
if ((mount_flags & EXT2_MF_MOUNTED) &&
|
|
|
|
!(mount_flags & EXT2_MF_READONLY)) {
|
|
|
|
fprintf(stderr,
|
2001-05-14 12:12:27 +08:00
|
|
|
_("The has_journal flag may only be "
|
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-04 01:02:13 +08:00
|
|
|
"cleared when the filesystem is\n"
|
|
|
|
"unmounted or mounted "
|
|
|
|
"read-only.\n"));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (sb->s_feature_incompat &
|
|
|
|
EXT3_FEATURE_INCOMPAT_RECOVER) {
|
|
|
|
fprintf(stderr,
|
2001-05-14 12:12:27 +08:00
|
|
|
_("The needs_recovery flag is set. "
|
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-04 01:02:13 +08:00
|
|
|
"Please run e2fsck before clearing\n"
|
2001-05-26 00:38:48 +08:00
|
|
|
"the has_journal flag.\n"));
|
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-04 01:02:13 +08:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Remove the immutable flag on the journal inode
|
|
|
|
*/
|
|
|
|
if (sb->s_journal_inum) {
|
|
|
|
retval = ext2fs_read_inode(fs, sb->s_journal_inum,
|
|
|
|
&inode);
|
|
|
|
if (retval) {
|
|
|
|
com_err(program_name, retval,
|
|
|
|
"while reading journal inode");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
inode.i_flags &= ~EXT2_IMMUTABLE_FL;
|
|
|
|
retval = ext2fs_write_inode(fs, sb->s_journal_inum,
|
|
|
|
&inode);
|
|
|
|
if (retval) {
|
|
|
|
com_err(program_name, retval,
|
2001-04-24 04:58:03 +08:00
|
|
|
"while writing journal inode");
|
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-04 01:02:13 +08:00
|
|
|
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 09:51:15 +08:00
|
|
|
if (sb->s_journal_dev)
|
|
|
|
remove_journal_device(fs);
|
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-04 01:02:13 +08:00
|
|
|
}
|
|
|
|
if (journal && !old_journal) {
|
|
|
|
/*
|
|
|
|
* If adding a journal flag, let the create journal
|
|
|
|
* code below handle creating setting the flag and
|
|
|
|
* creating the journal. We supply a default size if
|
|
|
|
* necessary.
|
|
|
|
*/
|
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 09:51:15 +08:00
|
|
|
if (!journal_size)
|
|
|
|
journal_size = -1;
|
2001-01-15 00:25:58 +08:00
|
|
|
sb->s_feature_compat &= ~EXT3_FEATURE_COMPAT_HAS_JOURNAL;
|
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-04 01:02:13 +08:00
|
|
|
journal = old_journal;
|
|
|
|
}
|
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 09:51:15 +08: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-04 01:02:13 +08:00
|
|
|
if (sb->s_rev_level == EXT2_GOOD_OLD_REV &&
|
|
|
|
(sb->s_feature_compat || sb->s_feature_ro_compat ||
|
|
|
|
sb->s_feature_incompat))
|
|
|
|
ext2fs_update_dynamic_rev(fs);
|
|
|
|
if ((sparse != old_sparse) ||
|
|
|
|
(filetype != old_filetype) ||
|
|
|
|
(journal != old_journal)) {
|
|
|
|
sb->s_state &= ~EXT2_VALID_FS;
|
|
|
|
printf("\n%s\n", _(please_fsck));
|
|
|
|
}
|
|
|
|
ext2fs_mark_super_dirty(fs);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add a journal to the filesystem.
|
|
|
|
*/
|
|
|
|
static void add_journal(ext2_filsys fs)
|
|
|
|
{
|
|
|
|
unsigned long journal_blocks;
|
|
|
|
errcode_t retval;
|
2001-01-16 15:47:31 +08:00
|
|
|
ext2_filsys jfs;
|
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-04 01:02:13 +08:00
|
|
|
|
|
|
|
if (fs->super->s_feature_compat &
|
|
|
|
EXT3_FEATURE_COMPAT_HAS_JOURNAL) {
|
|
|
|
fprintf(stderr, _("The filesystem already has a journal.\n"));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (journal_device) {
|
|
|
|
check_plausibility(journal_device);
|
|
|
|
check_mount(journal_device, 0, _("journal"));
|
2001-01-16 15:47:31 +08: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,
|
2001-04-17 09:01:49 +08:00
|
|
|
_("\n\twhile trying to open journal on %s\n"),
|
2001-01-16 15:47:31 +08:00
|
|
|
journal_device);
|
|
|
|
exit(1);
|
|
|
|
}
|
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-04 01:02:13 +08:00
|
|
|
printf(_("Creating journal on device %s: "),
|
|
|
|
journal_device);
|
2001-01-15 00:11:14 +08:00
|
|
|
fflush(stdout);
|
2001-01-16 15:47:31 +08:00
|
|
|
|
|
|
|
retval = ext2fs_add_journal_device(fs, jfs);
|
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-04 01:02:13 +08:00
|
|
|
if (retval) {
|
|
|
|
com_err (program_name, retval,
|
2001-05-14 12:12:27 +08:00
|
|
|
_("while adding filesystem to journal on %s"),
|
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-04 01:02:13 +08:00
|
|
|
journal_device);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
printf(_("done\n"));
|
2001-01-16 15:47:31 +08:00
|
|
|
ext2fs_close(jfs);
|
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-04 01:02:13 +08:00
|
|
|
} else if (journal_size) {
|
|
|
|
printf(_("Creating journal inode: "));
|
|
|
|
fflush(stdout);
|
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 04:07:13 +08:00
|
|
|
journal_blocks = figure_journal_size(journal_size, fs);
|
|
|
|
|
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-04 01:02:13 +08:00
|
|
|
retval = ext2fs_add_journal_inode(fs, journal_blocks,
|
|
|
|
journal_flags);
|
|
|
|
if (retval) {
|
|
|
|
printf("\n");
|
|
|
|
com_err(program_name, retval,
|
2001-04-17 09:01:49 +08:00
|
|
|
_("\n\twhile trying to create journal file"));
|
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-04 01:02:13 +08:00
|
|
|
exit(1);
|
2001-04-17 09:01:49 +08:00
|
|
|
} else
|
|
|
|
printf(_("done\n"));
|
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-04 01:02:13 +08:00
|
|
|
/*
|
|
|
|
* If the filesystem wasn't mounted, we need to force
|
|
|
|
* the block group descriptors out.
|
|
|
|
*/
|
|
|
|
if ((mount_flags & EXT2_MF_MOUNTED) == 0)
|
|
|
|
fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-01-09 08:16:26 +08:00
|
|
|
/*
|
|
|
|
* Given argv[0], return the program name.
|
|
|
|
*/
|
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-12 00:08:23 +08:00
|
|
|
static char *get_progname(char *argv_zero)
|
2001-01-09 08:16:26 +08:00
|
|
|
{
|
|
|
|
char *cp;
|
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-04 01:02:13 +08:00
|
|
|
|
2001-01-09 08:16:26 +08:00
|
|
|
cp = strrchr(argv_zero, '/');
|
|
|
|
if (!cp )
|
|
|
|
return argv_zero;
|
|
|
|
else
|
|
|
|
return cp+1;
|
|
|
|
}
|
1999-10-23 09:04:50 +08:00
|
|
|
|
2001-01-09 08:16:26 +08:00
|
|
|
|
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-12 00:08:23 +08:00
|
|
|
static void parse_e2label_options(int argc, char ** argv)
|
2001-01-09 08:16:26 +08:00
|
|
|
{
|
|
|
|
if ((argc < 2) || (argc > 3)) {
|
|
|
|
fprintf(stderr, _("Usage: e2label device [newlabel]\n"));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
device_name = argv[1];
|
|
|
|
if (argc == 3) {
|
|
|
|
open_flag = EXT2_FLAG_RW;
|
|
|
|
L_flag = 1;
|
|
|
|
new_label = argv[2];
|
|
|
|
} else
|
|
|
|
print_label++;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
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-12 00:08:23 +08:00
|
|
|
static void parse_tune2fs_options(int argc, char **argv)
|
1997-04-26 21:21:57 +08:00
|
|
|
{
|
1997-10-25 11:49:49 +08:00
|
|
|
int c;
|
1997-04-26 21:21:57 +08:00
|
|
|
char * tmp;
|
1997-04-26 21:34:30 +08:00
|
|
|
struct group * gr;
|
|
|
|
struct passwd * pw;
|
1997-04-26 21:21:57 +08: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 08:47:55 +08:00
|
|
|
fprintf (stderr, _("tune2fs %s, %s for EXT2 FS %s, %s\n"),
|
1997-04-26 21:21:57 +08:00
|
|
|
E2FSPROGS_VERSION, E2FSPROGS_DATE,
|
|
|
|
EXT2FS_VERSION, EXT2FS_DATE);
|
2001-04-24 04:58:03 +08:00
|
|
|
while ((c = getopt (argc, argv, "c:e:fg:i:jlm:r:s:u:C:J:L:M:O:U:")) != EOF)
|
1997-04-26 21:21:57 +08:00
|
|
|
switch (c)
|
|
|
|
{
|
|
|
|
case 'c':
|
2000-07-07 11:12:54 +08:00
|
|
|
max_mount_count = strtol (optarg, &tmp, 0);
|
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 13:11:14 +08:00
|
|
|
if (*tmp || max_mount_count > 16000) {
|
1997-04-26 21:21:57 +08: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 08:47:55 +08:00
|
|
|
_("bad mounts count - %s"),
|
1997-04-26 21:21:57 +08:00
|
|
|
optarg);
|
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 13:11:14 +08:00
|
|
|
usage();
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
2001-04-26 12:25:39 +08:00
|
|
|
if (max_mount_count == 0)
|
|
|
|
max_mount_count = -1;
|
1997-04-26 21:21:57 +08:00
|
|
|
c_flag = 1;
|
1997-04-29 22:53:37 +08:00
|
|
|
open_flag = EXT2_FLAG_RW;
|
|
|
|
break;
|
|
|
|
case 'C':
|
|
|
|
mount_count = strtoul (optarg, &tmp, 0);
|
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 13:11:14 +08:00
|
|
|
if (*tmp || mount_count > 16000) {
|
1997-04-29 22:53:37 +08: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 08:47:55 +08:00
|
|
|
_("bad mounts count - %s"),
|
1997-04-29 22:53:37 +08:00
|
|
|
optarg);
|
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 13:11:14 +08:00
|
|
|
usage();
|
1997-04-29 22:53:37 +08:00
|
|
|
}
|
|
|
|
C_flag = 1;
|
|
|
|
open_flag = EXT2_FLAG_RW;
|
1997-04-26 21:21:57 +08:00
|
|
|
break;
|
|
|
|
case 'e':
|
|
|
|
if (strcmp (optarg, "continue") == 0)
|
|
|
|
errors = EXT2_ERRORS_CONTINUE;
|
|
|
|
else if (strcmp (optarg, "remount-ro") == 0)
|
|
|
|
errors = EXT2_ERRORS_RO;
|
|
|
|
else if (strcmp (optarg, "panic") == 0)
|
|
|
|
errors = EXT2_ERRORS_PANIC;
|
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 13:11:14 +08:00
|
|
|
else {
|
1997-04-26 21:21:57 +08: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 08:47:55 +08:00
|
|
|
_("bad error behavior - %s"),
|
1997-04-26 21:21:57 +08:00
|
|
|
optarg);
|
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 13:11:14 +08:00
|
|
|
usage();
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
|
|
|
e_flag = 1;
|
1997-04-29 22:53:37 +08:00
|
|
|
open_flag = EXT2_FLAG_RW;
|
1997-04-26 21:21:57 +08:00
|
|
|
break;
|
2001-04-24 04:58:03 +08:00
|
|
|
case 'f': /* Force */
|
|
|
|
f_flag = 1;
|
|
|
|
break;
|
1997-04-26 21:34:30 +08:00
|
|
|
case 'g':
|
|
|
|
resgid = strtoul (optarg, &tmp, 0);
|
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 13:11:14 +08:00
|
|
|
if (*tmp) {
|
1997-04-26 21:34:30 +08:00
|
|
|
gr = getgrnam (optarg);
|
|
|
|
if (gr == NULL)
|
|
|
|
tmp = optarg;
|
1997-04-26 22:00:26 +08:00
|
|
|
else {
|
1997-04-26 21:34:30 +08:00
|
|
|
resgid = gr->gr_gid;
|
1997-04-26 22:00:26 +08:00
|
|
|
*tmp =0;
|
|
|
|
}
|
1997-04-26 21:34:30 +08:00
|
|
|
}
|
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 13:11:14 +08:00
|
|
|
if (*tmp) {
|
1997-04-26 21:34:30 +08: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 08:47:55 +08:00
|
|
|
_("bad gid/group name - %s"),
|
1997-04-26 21:34:30 +08:00
|
|
|
optarg);
|
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 13:11:14 +08:00
|
|
|
usage();
|
1997-04-26 21:34:30 +08:00
|
|
|
}
|
|
|
|
g_flag = 1;
|
1997-04-29 22:53:37 +08:00
|
|
|
open_flag = EXT2_FLAG_RW;
|
1997-04-26 21:34:30 +08:00
|
|
|
break;
|
1997-04-26 21:21:57 +08:00
|
|
|
case 'i':
|
|
|
|
interval = strtoul (optarg, &tmp, 0);
|
1997-04-29 22:53:37 +08:00
|
|
|
switch (*tmp) {
|
|
|
|
case 's':
|
|
|
|
tmp++;
|
|
|
|
break;
|
|
|
|
case '\0':
|
|
|
|
case 'd':
|
|
|
|
case 'D': /* days */
|
|
|
|
interval *= 86400;
|
|
|
|
if (*tmp != '\0')
|
1997-04-26 21:34:30 +08:00
|
|
|
tmp++;
|
1997-04-29 22:53:37 +08:00
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
case 'M': /* months! */
|
|
|
|
interval *= 86400 * 30;
|
|
|
|
tmp++;
|
|
|
|
break;
|
|
|
|
case 'w':
|
|
|
|
case 'W': /* weeks */
|
|
|
|
interval *= 86400 * 7;
|
|
|
|
tmp++;
|
|
|
|
break;
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
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 13:11:14 +08:00
|
|
|
if (*tmp || interval > (365 * 86400)) {
|
1997-04-26 21:21:57 +08: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 08:47:55 +08:00
|
|
|
_("bad interval - %s"), optarg);
|
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 13:11:14 +08:00
|
|
|
usage();
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
|
|
|
i_flag = 1;
|
1997-04-29 22:53:37 +08:00
|
|
|
open_flag = EXT2_FLAG_RW;
|
1997-04-26 21:21:57 +08:00
|
|
|
break;
|
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-04 01:02:13 +08: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 09:51:15 +08:00
|
|
|
if (!journal_size)
|
|
|
|
journal_size = -1;
|
2001-04-24 04:58:03 +08:00
|
|
|
open_flag = EXT2_FLAG_RW;
|
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 09:51:15 +08:00
|
|
|
break;
|
|
|
|
case 'J':
|
|
|
|
parse_journal_opts(optarg);
|
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-04 01:02:13 +08:00
|
|
|
open_flag = EXT2_FLAG_RW;
|
|
|
|
break;
|
2001-01-15 00:25:58 +08:00
|
|
|
case 'l':
|
|
|
|
l_flag = 1;
|
|
|
|
break;
|
1997-04-29 22:53:37 +08:00
|
|
|
case 'L':
|
|
|
|
new_label = optarg;
|
|
|
|
L_flag = 1;
|
|
|
|
open_flag = EXT2_FLAG_RW;
|
|
|
|
break;
|
1997-04-26 21:21:57 +08:00
|
|
|
case 'm':
|
|
|
|
reserved_ratio = strtoul (optarg, &tmp, 0);
|
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 13:11:14 +08:00
|
|
|
if (*tmp || reserved_ratio > 50) {
|
1997-04-26 21:21:57 +08: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 08:47:55 +08:00
|
|
|
_("bad reserved block ratio - %s"),
|
1997-04-26 21:21:57 +08:00
|
|
|
optarg);
|
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 13:11:14 +08:00
|
|
|
usage();
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
|
|
|
m_flag = 1;
|
1997-04-29 22:53:37 +08:00
|
|
|
open_flag = EXT2_FLAG_RW;
|
|
|
|
break;
|
|
|
|
case 'M':
|
|
|
|
new_last_mounted = optarg;
|
|
|
|
M_flag = 1;
|
|
|
|
open_flag = EXT2_FLAG_RW;
|
1997-04-26 21:21:57 +08:00
|
|
|
break;
|
1999-10-23 09:04:50 +08:00
|
|
|
case 'O':
|
|
|
|
features_cmd = optarg;
|
|
|
|
open_flag = EXT2_FLAG_RW;
|
|
|
|
break;
|
1997-04-26 21:34:30 +08:00
|
|
|
case 'r':
|
|
|
|
reserved_blocks = strtoul (optarg, &tmp, 0);
|
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 13:11:14 +08:00
|
|
|
if (*tmp) {
|
1997-04-26 21:34:30 +08: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 08:47:55 +08:00
|
|
|
_("bad reserved blocks count - %s"),
|
1997-04-26 21:34:30 +08:00
|
|
|
optarg);
|
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 13:11:14 +08:00
|
|
|
usage();
|
1997-04-26 21:34:30 +08:00
|
|
|
}
|
|
|
|
r_flag = 1;
|
1997-04-29 22:53:37 +08:00
|
|
|
open_flag = EXT2_FLAG_RW;
|
1997-04-26 21:34:30 +08:00
|
|
|
break;
|
1997-04-30 01:48:10 +08:00
|
|
|
case 's':
|
|
|
|
s_flag = atoi(optarg);
|
|
|
|
open_flag = EXT2_FLAG_RW;
|
|
|
|
break;
|
1997-04-26 21:34:30 +08:00
|
|
|
case 'u':
|
|
|
|
resuid = strtoul (optarg, &tmp, 0);
|
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 13:11:14 +08:00
|
|
|
if (*tmp) {
|
1997-04-26 21:34:30 +08:00
|
|
|
pw = getpwnam (optarg);
|
|
|
|
if (pw == NULL)
|
|
|
|
tmp = optarg;
|
1997-04-26 22:00:26 +08:00
|
|
|
else {
|
1997-04-26 21:34:30 +08:00
|
|
|
resuid = pw->pw_uid;
|
1997-04-26 22:00:26 +08:00
|
|
|
*tmp = 0;
|
|
|
|
}
|
1997-04-26 21:34:30 +08:00
|
|
|
}
|
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 13:11:14 +08:00
|
|
|
if (*tmp) {
|
1997-04-26 21:34:30 +08: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 08:47:55 +08:00
|
|
|
_("bad uid/user name - %s"),
|
1997-04-26 21:34:30 +08:00
|
|
|
optarg);
|
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 13:11:14 +08:00
|
|
|
usage();
|
1997-04-26 21:34:30 +08:00
|
|
|
}
|
|
|
|
u_flag = 1;
|
1997-04-29 22:53:37 +08:00
|
|
|
open_flag = EXT2_FLAG_RW;
|
|
|
|
break;
|
|
|
|
case 'U':
|
|
|
|
new_UUID = optarg;
|
|
|
|
U_flag = 1;
|
|
|
|
open_flag = EXT2_FLAG_RW;
|
1997-04-26 21:34:30 +08:00
|
|
|
break;
|
1997-04-26 21:21:57 +08:00
|
|
|
default:
|
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 13:11:14 +08:00
|
|
|
usage();
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
|
|
|
if (optind < argc - 1 || optind == argc)
|
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 13:11:14 +08:00
|
|
|
usage();
|
1997-04-29 22:53:37 +08:00
|
|
|
if (!open_flag && !l_flag)
|
|
|
|
usage();
|
1997-04-26 21:21:57 +08:00
|
|
|
device_name = argv[optind];
|
2001-01-09 08:16:26 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int main (int argc, char ** argv)
|
|
|
|
{
|
|
|
|
errcode_t retval;
|
|
|
|
ext2_filsys fs;
|
|
|
|
struct ext2_super_block *sb;
|
|
|
|
|
|
|
|
#ifdef ENABLE_NLS
|
|
|
|
setlocale(LC_MESSAGES, "");
|
|
|
|
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
|
|
|
|
textdomain(NLS_CAT_NAME);
|
|
|
|
#endif
|
|
|
|
if (argc && *argv)
|
|
|
|
program_name = *argv;
|
|
|
|
initialize_ext2_error_table();
|
|
|
|
|
|
|
|
if (strcmp(get_progname(argv[0]), "e2label") == 0)
|
|
|
|
parse_e2label_options(argc, argv);
|
|
|
|
else
|
|
|
|
parse_tune2fs_options(argc, argv);
|
|
|
|
|
1997-04-29 22:53:37 +08:00
|
|
|
retval = ext2fs_open (device_name, open_flag, 0, 0,
|
|
|
|
unix_io_manager, &fs);
|
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 13:11:14 +08:00
|
|
|
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 08:47:55 +08:00
|
|
|
com_err (program_name, retval, _("while trying to open %s"),
|
1997-04-26 21:21:57 +08:00
|
|
|
device_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 08:47:55 +08:00
|
|
|
printf(_("Couldn't find valid filesystem superblock.\n"));
|
1997-04-26 21:21:57 +08:00
|
|
|
exit(1);
|
|
|
|
}
|
2001-01-09 08:16:26 +08:00
|
|
|
sb = fs->super;
|
|
|
|
if (print_label) {
|
|
|
|
/* For e2label emulation */
|
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-12 00:08:23 +08:00
|
|
|
printf("%.*s\n", (int) sizeof(sb->s_volume_name),
|
|
|
|
sb->s_volume_name);
|
2001-01-09 08:16:26 +08:00
|
|
|
exit(0);
|
|
|
|
}
|
2001-01-01 23:26:58 +08:00
|
|
|
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);
|
2001-01-15 00:11:14 +08:00
|
|
|
exit(1);
|
2001-01-01 23:26:58 +08: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-04 01:02:13 +08:00
|
|
|
/* Normally we only need to write out the superblock */
|
|
|
|
fs->flags |= EXT2_FLAG_SUPER_ONLY;
|
1997-04-26 21:21:57 +08:00
|
|
|
|
1997-04-29 22:53:37 +08:00
|
|
|
if (c_flag) {
|
2001-01-01 23:26:58 +08:00
|
|
|
sb->s_max_mnt_count = max_mount_count;
|
1997-04-26 21:21:57 +08:00
|
|
|
ext2fs_mark_super_dirty(fs);
|
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 08:47:55 +08:00
|
|
|
printf (_("Setting maximal mount count to %d\n"),
|
1997-04-29 22:53:37 +08:00
|
|
|
max_mount_count);
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
1997-04-29 22:53:37 +08:00
|
|
|
if (C_flag) {
|
2001-01-01 23:26:58 +08:00
|
|
|
sb->s_mnt_count = mount_count;
|
1997-04-29 22:53:37 +08:00
|
|
|
ext2fs_mark_super_dirty(fs);
|
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 08:47:55 +08:00
|
|
|
printf (_("Setting current mount count to %d\n"), mount_count);
|
1997-04-29 22:53:37 +08:00
|
|
|
}
|
|
|
|
if (e_flag) {
|
2001-01-01 23:26:58 +08:00
|
|
|
sb->s_errors = errors;
|
1997-04-26 21:21:57 +08:00
|
|
|
ext2fs_mark_super_dirty(fs);
|
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 08:47:55 +08:00
|
|
|
printf (_("Setting error behavior to %d\n"), errors);
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
2001-01-01 23:26:58 +08:00
|
|
|
if (g_flag) {
|
|
|
|
sb->s_def_resgid = resgid;
|
1997-04-26 21:34:30 +08:00
|
|
|
ext2fs_mark_super_dirty(fs);
|
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 08:47:55 +08:00
|
|
|
printf (_("Setting reserved blocks gid to %lu\n"), resgid);
|
1997-04-26 21:34:30 +08:00
|
|
|
}
|
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 13:11:14 +08:00
|
|
|
if (i_flag) {
|
2001-01-01 23:26:58 +08:00
|
|
|
sb->s_checkinterval = interval;
|
1997-04-26 21:21:57 +08:00
|
|
|
ext2fs_mark_super_dirty(fs);
|
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 08:47:55 +08:00
|
|
|
printf (_("Setting interval between check %lu seconds\n"), interval);
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
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 13:11:14 +08:00
|
|
|
if (m_flag) {
|
2001-01-01 23:26:58 +08:00
|
|
|
sb->s_r_blocks_count = (sb->s_blocks_count / 100)
|
1997-04-26 21:21:57 +08:00
|
|
|
* reserved_ratio;
|
|
|
|
ext2fs_mark_super_dirty(fs);
|
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 08:47:55 +08:00
|
|
|
printf (_("Setting reserved blocks percentage to %lu (%u blocks)\n"),
|
2001-01-01 23:26:58 +08:00
|
|
|
reserved_ratio, sb->s_r_blocks_count);
|
1997-04-26 21:21:57 +08:00
|
|
|
}
|
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 13:11:14 +08:00
|
|
|
if (r_flag) {
|
2001-01-01 23:26:58 +08:00
|
|
|
if (reserved_blocks >= sb->s_blocks_count) {
|
1997-04-26 21:34:30 +08: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 08:47:55 +08:00
|
|
|
_("reserved blocks count is too big (%ul)"),
|
1997-04-26 21:34:30 +08:00
|
|
|
reserved_blocks);
|
|
|
|
exit (1);
|
|
|
|
}
|
2001-01-01 23:26:58 +08:00
|
|
|
sb->s_r_blocks_count = reserved_blocks;
|
1997-04-26 21:34:30 +08:00
|
|
|
ext2fs_mark_super_dirty(fs);
|
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 08:47:55 +08:00
|
|
|
printf (_("Setting reserved blocks count to %lu\n"),
|
1997-04-26 21:34:30 +08:00
|
|
|
reserved_blocks);
|
|
|
|
}
|
1997-04-30 01:48:10 +08:00
|
|
|
if (s_flag == 1) {
|
|
|
|
if (sb->s_feature_ro_compat &
|
|
|
|
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)
|
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 08:47:55 +08:00
|
|
|
fprintf(stderr, _("\nThe filesystem already"
|
2000-02-11 13:00:19 +08:00
|
|
|
" has sparse superblocks.\n"));
|
1997-04-30 01:48:10 +08:00
|
|
|
else {
|
|
|
|
sb->s_feature_ro_compat |=
|
|
|
|
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
|
2001-01-01 23:26:58 +08:00
|
|
|
sb->s_state &= ~EXT2_VALID_FS;
|
1997-04-30 01:48:10 +08:00
|
|
|
ext2fs_mark_super_dirty(fs);
|
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 08:47:55 +08:00
|
|
|
printf(_("\nSparse superblock flag set. %s"),
|
2000-02-09 05:35:41 +08:00
|
|
|
_(please_fsck));
|
1997-04-30 01:48:10 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (s_flag == 0) {
|
|
|
|
if (!(sb->s_feature_ro_compat &
|
|
|
|
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER))
|
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 08:47:55 +08:00
|
|
|
fprintf(stderr, _("\nThe filesystem already"
|
2000-02-11 13:00:19 +08:00
|
|
|
" has sparse superblocks disabled.\n"));
|
1997-04-30 01:48:10 +08:00
|
|
|
else {
|
|
|
|
sb->s_feature_ro_compat &=
|
|
|
|
~EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
|
2001-01-01 23:26:58 +08:00
|
|
|
sb->s_state &= ~EXT2_VALID_FS;
|
1997-04-30 01:48:10 +08:00
|
|
|
fs->flags |= EXT2_FLAG_MASTER_SB_ONLY;
|
|
|
|
ext2fs_mark_super_dirty(fs);
|
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 08:47:55 +08:00
|
|
|
printf(_("\nSparse superblock flag cleared. %s"),
|
2000-02-09 05:35:41 +08:00
|
|
|
_(please_fsck));
|
1997-04-30 01:48:10 +08:00
|
|
|
}
|
|
|
|
}
|
2001-01-01 23:26:58 +08:00
|
|
|
if (u_flag) {
|
|
|
|
sb->s_def_resuid = resuid;
|
1997-04-26 21:34:30 +08:00
|
|
|
ext2fs_mark_super_dirty(fs);
|
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 08:47:55 +08:00
|
|
|
printf (_("Setting reserved blocks uid to %lu\n"), resuid);
|
1997-04-26 21:34:30 +08:00
|
|
|
}
|
1997-04-29 22:53:37 +08:00
|
|
|
if (L_flag) {
|
1998-03-30 09:20:55 +08:00
|
|
|
if (strlen(new_label) > sizeof(sb->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 08:47:55 +08:00
|
|
|
fprintf(stderr, _("Warning: label too "
|
|
|
|
"long, truncating.\n"));
|
1997-04-29 22:53:37 +08:00
|
|
|
memset(sb->s_volume_name, 0, sizeof(sb->s_volume_name));
|
|
|
|
strncpy(sb->s_volume_name, new_label,
|
|
|
|
sizeof(sb->s_volume_name));
|
|
|
|
ext2fs_mark_super_dirty(fs);
|
|
|
|
}
|
|
|
|
if (M_flag) {
|
|
|
|
memset(sb->s_last_mounted, 0, sizeof(sb->s_last_mounted));
|
|
|
|
strncpy(sb->s_last_mounted, new_last_mounted,
|
|
|
|
sizeof(sb->s_last_mounted));
|
|
|
|
ext2fs_mark_super_dirty(fs);
|
|
|
|
}
|
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-04 01:02:13 +08:00
|
|
|
if (features_cmd)
|
|
|
|
update_feature_set(fs, features_cmd);
|
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 09:51:15 +08:00
|
|
|
if (journal_size || 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-04 01:02:13 +08:00
|
|
|
add_journal(fs);
|
|
|
|
|
1997-04-29 22:53:37 +08:00
|
|
|
if (U_flag) {
|
2001-04-24 04:58:03 +08:00
|
|
|
if ((strcasecmp(new_UUID, "null") == 0) ||
|
|
|
|
(strcasecmp(new_UUID, "clear") == 0)) {
|
1997-04-29 22:53:37 +08:00
|
|
|
uuid_clear(sb->s_uuid);
|
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-04 01:02:13 +08:00
|
|
|
} else if (strcasecmp(new_UUID, "time") == 0) {
|
|
|
|
uuid_generate_time(sb->s_uuid);
|
1997-04-29 22:53:37 +08:00
|
|
|
} else if (strcasecmp(new_UUID, "random") == 0) {
|
|
|
|
uuid_generate(sb->s_uuid);
|
|
|
|
} else if (uuid_parse(new_UUID, sb->s_uuid)) {
|
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 08:47:55 +08:00
|
|
|
com_err(program_name, 0, _("Invalid UUID format\n"));
|
1997-04-29 22:53:37 +08:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
ext2fs_mark_super_dirty(fs);
|
|
|
|
}
|
|
|
|
|
1997-04-26 21:21:57 +08:00
|
|
|
if (l_flag)
|
2001-01-01 23:26:58 +08:00
|
|
|
list_super (sb);
|
1997-04-26 21:21:57 +08:00
|
|
|
ext2fs_close (fs);
|
|
|
|
exit (0);
|
|
|
|
}
|