* 94/03/06 - Added the checks interval from Uwe Ohse (uwe@tirka.gun.de)
*/
+#define _XOPEN_SOURCE 500 /* for inclusion of strptime() */
+#define _BSD_SOURCE /* for inclusion of strcasecmp() */
#include <fcntl.h>
#include <grp.h>
#ifdef HAVE_GETOPT_H
#include "e2p/e2p.h"
#include "jfs_user.h"
#include "util.h"
-#include "get_device_by_label.h"
+#include "blkid/blkid.h"
#include "../version.h"
#include "nls-enable.h"
const char * program_name = "tune2fs";
char * device_name;
char * new_label, *new_last_mounted, *new_UUID;
+char * io_options;
static int c_flag, C_flag, e_flag, f_flag, g_flag, i_flag, l_flag, L_flag;
-static int m_flag, M_flag, r_flag, s_flag = -1, u_flag, U_flag;
+static int m_flag, M_flag, r_flag, s_flag = -1, u_flag, U_flag, T_flag;
+static time_t last_check_time;
static int print_label;
static int max_mount_count, mount_count, mount_flags;
-static unsigned long interval, reserved_ratio, reserved_blocks;
+static unsigned long interval, reserved_blocks;
+static double reserved_ratio;
static unsigned long resgid, resuid;
static unsigned short errors;
static int open_flag;
static char *features_cmd;
+static char *mntopts_cmd;
int journal_size, journal_flags;
char *journal_device;
static const char *please_fsck = N_("Please run e2fsck on the filesystem.\n");
+void do_findfs(int argc, char **argv);
+
static void usage(void)
{
fprintf(stderr,
- _("Usage: %s [-c max-mounts-count] [-e errors-behavior] "
+ _("Usage: %s [-c max_mounts_count] [-e errors_behavior] "
"[-g group]\n"
- "\t[-i interval[d|m|w]] [-j] [-J journal-options]\n"
- "\t[-l] [-s sparse-flag] [-m reserved-blocks-percent]\n"
- "\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);
+ "\t[-i interval[d|m|w]] [-j] [-J journal_options]\n"
+ "\t[-l] [-s sparse_flag] [-m reserved_blocks_percent]\n"
+ "\t[-o [^]mount_options[,...]] [-r reserved_blocks_count]\n"
+ "\t[-u user] [-C mount_count] [-L volume_label] "
+ "[-M last_mounted_dir]\n"
+ "\t[-O [^]feature[,...]] [-T last_check_time] [-U UUID]"
+ " device\n"), program_name);
exit (1);
}
static __u32 ok_features[3] = {
- EXT3_FEATURE_COMPAT_HAS_JOURNAL, /* Compat */
+ EXT3_FEATURE_COMPAT_HAS_JOURNAL |
+ EXT2_FEATURE_COMPAT_DIR_INDEX, /* Compat */
EXT2_FEATURE_INCOMPAT_FILETYPE, /* Incompat */
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER /* R/O compat */
};
*/
static void remove_journal_device(ext2_filsys fs)
{
- char *journal_device;
+ char *journal_path;
ext2_filsys jfs;
char buf[1024];
journal_superblock_t *jsb;
int i, nr_users;
errcode_t retval;
int commit_remove_journal = 0;
+ io_manager io_ptr;
if (f_flag)
commit_remove_journal = 1; /* force removal even if error */
uuid_unparse(fs->super->s_journal_uuid, buf);
- journal_device = get_spec_by_uuid(buf);
+ journal_path = blkid_get_devname(NULL, "UUID", buf);
- if (!journal_device) {
- journal_device =
+ if (!journal_path) {
+ journal_path =
ext2fs_find_block_device(fs->super->s_journal_dev);
- if (!journal_device)
+ if (!journal_path)
return;
}
- retval = ext2fs_open(journal_device, EXT2_FLAG_RW|
+#ifdef CONFIG_TESTIO_DEBUG
+ io_ptr = test_io_manager;
+ test_io_backing_manager = unix_io_manager;
+#else
+ io_ptr = unix_io_manager;
+#endif
+ retval = ext2fs_open(journal_path, EXT2_FLAG_RW|
EXT2_FLAG_JOURNAL_DEV_OK, 0,
- fs->blocksize, unix_io_manager, &jfs);
+ fs->blocksize, io_ptr, &jfs);
if (retval) {
com_err(program_name, retval,
_("while trying to open external journal"));
}
if (!(jfs->super->s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)) {
fprintf(stderr, _("%s is not a journal device.\n"),
- journal_device);
+ journal_path);
goto no_valid_journal;
}
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"));
+ fputs(_("Journal superblock not found!\n"), stderr);
goto no_valid_journal;
}
break;
}
if (i >= nr_users) {
- fprintf(stderr,
- _("Filesystem's UUID not found on journal device.\n"));
+ fputs(_("Filesystem's UUID not found on journal device.\n"),
+ stderr);
commit_remove_journal = 1;
goto no_valid_journal;
}
no_valid_journal:
if (commit_remove_journal == 0) {
- fprintf(stderr, _("Journal NOT removed\n"));
+ fputs(_("Journal NOT removed\n"), stderr);
exit(1);
}
fs->super->s_journal_dev = 0;
- memset(fs->super->s_journal_uuid, 0,
- sizeof(fs->super->s_journal_uuid));
+ uuid_clear(fs->super->s_journal_uuid);
ext2fs_mark_super_dirty(fs);
- printf(_("Journal removed\n"));
- free(journal_device);
+ fputs(_("Journal removed\n"), stdout);
+ free(journal_path);
}
/* Helper function for remove_journal_inode */
static int release_blocks_proc(ext2_filsys fs, blk_t *blocknr,
- int blockcnt, void *private)
+ int blockcnt EXT2FS_ATTR((unused)),
+ void *private EXT2FS_ATTR((unused)))
{
blk_t block;
int group;
}
/*
+ * Update the default mount options
+ */
+static void update_mntopts(ext2_filsys fs, char *mntopts)
+{
+ struct ext2_super_block *sb= fs->super;
+
+ if (e2p_edit_mntopts(mntopts, &sb->s_default_mount_opts, ~0)) {
+ fprintf(stderr, _("Invalid mount option set: %s\n"),
+ mntopts);
+ exit(1);
+ }
+ ext2fs_mark_super_dirty(fs);
+}
+
+/*
* Update the feature set as provided by the user.
*/
static void update_feature_set(ext2_filsys fs, char *features)
{
int sparse, old_sparse, filetype, old_filetype;
- int journal, old_journal;
- struct ext2_inode inode;
+ int journal, old_journal, dxdir, old_dxdir;
struct ext2_super_block *sb= fs->super;
- errcode_t retval;
+ __u32 old_compat, old_incompat, old_ro_compat;
+
+ old_compat = sb->s_feature_compat;
+ old_ro_compat = sb->s_feature_ro_compat;
+ old_incompat = sb->s_feature_incompat;
old_sparse = sb->s_feature_ro_compat &
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
EXT2_FEATURE_INCOMPAT_FILETYPE;
old_journal = sb->s_feature_compat &
EXT3_FEATURE_COMPAT_HAS_JOURNAL;
+ old_dxdir = sb->s_feature_compat &
+ EXT2_FEATURE_COMPAT_DIR_INDEX;
if (e2p_edit_feature(features, &sb->s_feature_compat,
ok_features)) {
fprintf(stderr, _("Invalid filesystem option set: %s\n"),
EXT2_FEATURE_INCOMPAT_FILETYPE;
journal = sb->s_feature_compat &
EXT3_FEATURE_COMPAT_HAS_JOURNAL;
+ dxdir = sb->s_feature_compat &
+ EXT2_FEATURE_COMPAT_DIR_INDEX;
if (old_journal && !journal) {
if ((mount_flags & EXT2_MF_MOUNTED) &&
!(mount_flags & EXT2_MF_READONLY)) {
- fprintf(stderr,
- _("The has_journal flag may only be "
- "cleared when the filesystem is\n"
- "unmounted or mounted "
- "read-only.\n"));
+ fputs(_("The has_journal flag may only be "
+ "cleared when the filesystem is\n"
+ "unmounted or mounted "
+ "read-only.\n"), stderr);
exit(1);
}
if (sb->s_feature_incompat &
EXT3_FEATURE_INCOMPAT_RECOVER) {
- fprintf(stderr,
- _("The needs_recovery flag is set. "
- "Please run e2fsck before clearing\n"
- "the has_journal flag.\n"));
+ fputs(_("The needs_recovery flag is set. "
+ "Please run e2fsck before clearing\n"
+ "the has_journal flag.\n"), stderr);
exit(1);
}
if (sb->s_journal_inum) {
journal_size = -1;
sb->s_feature_compat &= ~EXT3_FEATURE_COMPAT_HAS_JOURNAL;
}
+ if (dxdir && !old_dxdir) {
+ if (!sb->s_def_hash_version)
+ sb->s_def_hash_version = EXT2_HASH_TEA;
+ if (uuid_is_null((unsigned char *) sb->s_hash_seed))
+ uuid_generate((unsigned char *) sb->s_hash_seed);
+ }
if (sb->s_rev_level == EXT2_GOOD_OLD_REV &&
(sb->s_feature_compat || sb->s_feature_ro_compat ||
sb->s_state &= ~EXT2_VALID_FS;
printf("\n%s\n", _(please_fsck));
}
- ext2fs_mark_super_dirty(fs);
+ if ((old_compat != sb->s_feature_compat) ||
+ (old_ro_compat != sb->s_feature_ro_compat) ||
+ (old_incompat != sb->s_feature_incompat))
+ ext2fs_mark_super_dirty(fs);
}
/*
unsigned long journal_blocks;
errcode_t retval;
ext2_filsys jfs;
+ io_manager io_ptr;
if (fs->super->s_feature_compat &
EXT3_FEATURE_COMPAT_HAS_JOURNAL) {
- fprintf(stderr, _("The filesystem already has a journal.\n"));
+ fputs(_("The filesystem already has a journal.\n"), stderr);
goto err;
}
if (journal_device) {
check_plausibility(journal_device);
check_mount(journal_device, 0, _("journal"));
+#ifdef CONFIG_TESTIO_DEBUG
+ io_ptr = test_io_manager;
+ test_io_backing_manager = unix_io_manager;
+#else
+ io_ptr = unix_io_manager;
+#endif
retval = ext2fs_open(journal_device, EXT2_FLAG_RW|
EXT2_FLAG_JOURNAL_DEV_OK, 0,
- fs->blocksize, unix_io_manager, &jfs);
+ fs->blocksize, io_ptr, &jfs);
if (retval) {
com_err(program_name, retval,
_("\n\twhile trying to open journal on %s\n"),
journal_device);
goto err;
}
- printf(_("done\n"));
+ fputs(_("done\n"), stdout);
} else if (journal_size) {
- printf(_("Creating journal inode: "));
+ fputs(_("Creating journal inode: "), stdout);
fflush(stdout);
journal_blocks = figure_journal_size(journal_size, fs);
_("\n\twhile trying to create journal file"));
exit(1);
} else
- printf(_("done\n"));
+ fputs(_("done\n"), stdout);
/*
* If the filesystem wasn't mounted, we need to force
* the block group descriptors out.
exit(1);
}
-/*
- * Given argv[0], return the program name.
- */
-static char *get_progname(char *argv_zero)
-{
- char *cp;
-
- cp = strrchr(argv_zero, '/');
- if (!cp )
- return argv_zero;
- else
- return cp+1;
-}
-
static void parse_e2label_options(int argc, char ** argv)
{
if ((argc < 2) || (argc > 3)) {
- fprintf(stderr, _("Usage: e2label device [newlabel]\n"));
+ fputs(_("Usage: e2label device [newlabel]\n"), stderr);
+ exit(1);
+ }
+ io_options = strchr(argv[1], '?');
+ if (io_options)
+ *io_options++ = 0;
+ device_name = blkid_get_devname(NULL, argv[1], NULL);
+ if (!device_name) {
+ com_err("e2label", 0, _("Unable to resolve '%s'"),
+ argv[1]);
exit(1);
}
- device_name = argv[1];
if (argc == 3) {
open_flag = EXT2_FLAG_RW | EXT2_FLAG_JOURNAL_DEV_OK;
L_flag = 1;
print_label++;
}
+static time_t parse_time(char *str)
+{
+ struct tm ts;
+
+ if (strcmp(str, "now") == 0) {
+ return (time(0));
+ }
+ memset(&ts, 0, sizeof(ts));
+#ifdef HAVE_STRPTIME
+ strptime(str, "%Y%m%d%H%M%S", &ts);
+#else
+ sscanf(str, "%4d%2d%2d%2d%2d%2d", &ts.tm_year, &ts.tm_mon,
+ &ts.tm_mday, &ts.tm_hour, &ts.tm_min, &ts.tm_sec);
+ ts.tm_year -= 1900;
+ ts.tm_mon -= 1;
+ if (ts.tm_year < 0 || ts.tm_mon < 0 || ts.tm_mon > 11 ||
+ ts.tm_mday < 0 || ts.tm_mday > 31 || ts.tm_hour > 23 ||
+ ts.tm_min > 59 || ts.tm_sec > 61)
+ ts.tm_mday = 0;
+#endif
+ if (ts.tm_mday == 0) {
+ com_err(program_name, 0,
+ _("Couldn't parse date/time specifier: %s"),
+ str);
+ usage();
+ }
+ return (mktime(&ts));
+}
static void parse_tune2fs_options(int argc, char **argv)
{
struct passwd * pw;
printf("tune2fs %s (%s)\n", E2FSPROGS_VERSION, E2FSPROGS_DATE);
- while ((c = getopt (argc, argv, "c:e:fg:i:jlm:r:s:u:C:J:L:M:O:U:")) != EOF)
+ while ((c = getopt(argc, argv, "c:e:fg:i:jlm:o:r:s:u:C:J:L:M:O:T:U:")) != EOF)
switch (c)
{
case 'c':
tmp++;
break;
}
- if (*tmp || interval > (365 * 86400)) {
+ if (*tmp) {
com_err (program_name, 0,
_("bad interval - %s"), optarg);
usage();
EXT2_FLAG_JOURNAL_DEV_OK;
break;
case 'm':
- reserved_ratio = strtoul (optarg, &tmp, 0);
+ reserved_ratio = strtod(optarg, &tmp);
if (*tmp || reserved_ratio > 50) {
com_err (program_name, 0,
_("bad reserved block ratio - %s"),
M_flag = 1;
open_flag = EXT2_FLAG_RW;
break;
+ case 'o':
+ if (mntopts_cmd) {
+ com_err (program_name, 0,
+ _("-o may only be specified once"));
+ usage();
+ }
+ mntopts_cmd = optarg;
+ open_flag = EXT2_FLAG_RW;
+ break;
+
case 'O':
if (features_cmd) {
com_err (program_name, 0,
s_flag = atoi(optarg);
open_flag = EXT2_FLAG_RW;
break;
+ case 'T':
+ T_flag = 1;
+ last_check_time = parse_time(optarg);
+ open_flag = EXT2_FLAG_RW;
+ break;
case 'u':
resuid = strtoul (optarg, &tmp, 0);
if (*tmp) {
usage();
if (!open_flag && !l_flag)
usage();
- device_name = argv[optind];
-}
+ io_options = strchr(argv[optind], '?');
+ if (io_options)
+ *io_options++ = 0;
+ device_name = blkid_get_devname(NULL, argv[optind], NULL);
+ if (!device_name) {
+ com_err("tune2fs", 0, _("Unable to resolve '%s'"),
+ argv[optind]);
+ exit(1);
+ }
+}
+void do_findfs(int argc, char **argv)
+{
+ char *dev;
+
+ if ((argc != 2) ||
+ (strncmp(argv[1], "LABEL=", 6) && strncmp(argv[1], "UUID=", 5))) {
+ fprintf(stderr, "Usage: findfs LABEL=<label>|UUID=<uuid>\n");
+ exit(2);
+ }
+ dev = blkid_get_devname(NULL, argv[1], NULL);
+ if (!dev) {
+ com_err("findfs", 0, _("Unable to resolve '%s'"),
+ argv[1]);
+ exit(1);
+ }
+ puts(dev);
+ exit(0);
+}
int main (int argc, char ** argv)
errcode_t retval;
ext2_filsys fs;
struct ext2_super_block *sb;
+ io_manager io_ptr;
#ifdef ENABLE_NLS
setlocale(LC_MESSAGES, "");
+ setlocale(LC_CTYPE, "");
bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
textdomain(NLS_CAT_NAME);
#endif
if (argc && *argv)
program_name = *argv;
- initialize_ext2_error_table();
+ add_error_table(&et_ext2_error_table);
+ if (strcmp(get_progname(argv[0]), "findfs") == 0)
+ do_findfs(argc, argv);
if (strcmp(get_progname(argv[0]), "e2label") == 0)
parse_e2label_options(argc, argv);
else
parse_tune2fs_options(argc, argv);
- retval = ext2fs_open (device_name, open_flag, 0, 0,
- unix_io_manager, &fs);
+#ifdef CONFIG_TESTIO_DEBUG
+ io_ptr = test_io_manager;
+ test_io_backing_manager = unix_io_manager;
+#else
+ io_ptr = unix_io_manager;
+#endif
+ retval = ext2fs_open2(device_name, io_options, open_flag,
+ 0, 0, io_ptr, &fs);
if (retval) {
com_err (program_name, retval, _("while trying to open %s"),
device_name);
exit(1);
}
sb = fs->super;
+ fs->flags &= ~EXT2_FLAG_MASTER_SB_ONLY;
if (print_label) {
/* For e2label emulation */
printf("%.*s\n", (int) sizeof(sb->s_volume_name),
sb->s_volume_name);
+ remove_error_table(&et_ext2_error_table);
exit(0);
}
retval = ext2fs_check_if_mounted(device_name, &mount_flags);
if (i_flag) {
sb->s_checkinterval = interval;
ext2fs_mark_super_dirty(fs);
- printf (_("Setting interval between check %lu seconds\n"), interval);
+ printf (_("Setting interval between checks to %lu seconds\n"), interval);
}
if (m_flag) {
- sb->s_r_blocks_count = (sb->s_blocks_count / 100)
- * reserved_ratio;
+ sb->s_r_blocks_count = e2p_percent(reserved_ratio,
+ sb->s_blocks_count);
ext2fs_mark_super_dirty(fs);
- printf (_("Setting reserved blocks percentage to %lu (%u blocks)\n"),
+ printf (_("Setting reserved blocks percentage to %g%% (%u blocks)\n"),
reserved_ratio, sb->s_r_blocks_count);
}
if (r_flag) {
- if (reserved_blocks >= sb->s_blocks_count) {
+ if (reserved_blocks >= sb->s_blocks_count/2) {
com_err (program_name, 0,
- _("reserved blocks count is too big (%ul)"),
+ _("reserved blocks count is too big (%lu)"),
reserved_blocks);
exit (1);
}
if (s_flag == 1) {
if (sb->s_feature_ro_compat &
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)
- fprintf(stderr, _("\nThe filesystem already"
- " has sparse superblocks.\n"));
+ fputs(_("\nThe filesystem already has sparse "
+ "superblocks.\n"), stderr);
else {
sb->s_feature_ro_compat |=
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
if (s_flag == 0) {
if (!(sb->s_feature_ro_compat &
EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER))
- fprintf(stderr, _("\nThe filesystem already"
- " has sparse superblocks disabled.\n"));
+ fputs(_("\nThe filesystem already has sparse "
+ "superblocks disabled.\n"), stderr);
else {
sb->s_feature_ro_compat &=
~EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER;
_(please_fsck));
}
}
+ if (T_flag) {
+ sb->s_lastcheck = last_check_time;
+ ext2fs_mark_super_dirty(fs);
+ printf(_("Setting time filesystem last checked to %s\n"),
+ ctime(&last_check_time));
+ }
if (u_flag) {
sb->s_def_resuid = resuid;
ext2fs_mark_super_dirty(fs);
}
if (L_flag) {
if (strlen(new_label) > sizeof(sb->s_volume_name))
- fprintf(stderr, _("Warning: label too "
- "long, truncating.\n"));
+ fputs(_("Warning: label too long, truncating.\n"),
+ stderr);
memset(sb->s_volume_name, 0, sizeof(sb->s_volume_name));
strncpy(sb->s_volume_name, new_label,
sizeof(sb->s_volume_name));
sizeof(sb->s_last_mounted));
ext2fs_mark_super_dirty(fs);
}
+ if (mntopts_cmd)
+ update_mntopts(fs, mntopts_cmd);
if (features_cmd)
update_feature_set(fs, features_cmd);
if (journal_size || journal_device)
if (l_flag)
list_super (sb);
- ext2fs_close (fs);
- exit (0);
+ remove_error_table(&et_ext2_error_table);
+ return (ext2fs_close (fs) ? 1 : 0);
}
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff