#include "support/plausible.h"
#include "e2fsck.h"
#include "problem.h"
+#include "jfs_user.h"
#include "../version.h"
/* Command line options */
e2fsck_t e2fsck_global_ctx; /* Try your very best not to use this! */
-#ifdef CONFIG_JBD_DEBUG /* Enabled by configure --enable-jfs-debug */
+#ifdef CONFIG_JBD_DEBUG /* Enabled by configure --enable-jbd-debug */
int journal_enable_debug = -1;
#endif
static void usage(e2fsck_t ctx)
{
fprintf(stderr,
- _("Usage: %s [-panyrcdfvtDFV] [-b superblock] [-B blocksize]\n"
- "\t\t[-I inode_buffer_blocks] [-P process_inode_size]\n"
+ _("Usage: %s [-panyrcdfktvDFV] [-b superblock] [-B blocksize]\n"
"\t\t[-l|-L bad_blocks_file] [-C fd] [-j external_journal]\n"
"\t\t[-E extended-options] [-z undo_file] device\n"),
ctx->program_name);
unsigned int dir_links;
unsigned int num_files, num_links;
__u32 *mask, m;
- int frag_percent_file, frag_percent_dir, frag_percent_total;
+ int frag_percent_file = 0, frag_percent_dir = 0, frag_percent_total = 0;
int i, j, printed = 0;
dir_links = 2 * ctx->fs_directory_count - 1;
blocks_used = (ext2fs_blocks_count(fs->super) -
ext2fs_free_blocks_count(fs->super));
- frag_percent_file = (10000 * ctx->fs_fragmented) / inodes_used;
- frag_percent_file = (frag_percent_file + 5) / 10;
+ if (inodes_used > 0) {
+ frag_percent_file = (10000 * ctx->fs_fragmented) / inodes_used;
+ frag_percent_file = (frag_percent_file + 5) / 10;
- frag_percent_dir = (10000 * ctx->fs_fragmented_dir) / inodes_used;
- frag_percent_dir = (frag_percent_dir + 5) / 10;
+ frag_percent_dir = (10000 * ctx->fs_fragmented_dir) / inodes_used;
+ frag_percent_dir = (frag_percent_dir + 5) / 10;
- frag_percent_total = ((10000 * (ctx->fs_fragmented +
- ctx->fs_fragmented_dir))
- / inodes_used);
- frag_percent_total = (frag_percent_total + 5) / 10;
+ frag_percent_total = ((10000 * (ctx->fs_fragmented +
+ ctx->fs_fragmented_dir))
+ / inodes_used);
+ frag_percent_total = (frag_percent_total + 5) / 10;
+ }
if (!verbose) {
log_out(ctx, _("%s: %u/%u files (%0d.%d%% non-contiguous), "
} else if (strcmp(token, "nodiscard") == 0) {
ctx->options &= ~E2F_OPT_DISCARD;
continue;
+ } else if (strcmp(token, "optimize_extents") == 0) {
+ ctx->options &= ~E2F_OPT_NOOPT_EXTENTS;
+ continue;
+ } else if (strcmp(token, "no_optimize_extents") == 0) {
+ ctx->options |= E2F_OPT_NOOPT_EXTENTS;
+ continue;
+ } else if (strcmp(token, "inode_count_fullmap") == 0) {
+ ctx->options |= E2F_OPT_ICOUNT_FULLMAP;
+ continue;
+ } else if (strcmp(token, "no_inode_count_fullmap") == 0) {
+ ctx->options &= ~E2F_OPT_ICOUNT_FULLMAP;
+ continue;
} else if (strcmp(token, "log_filename") == 0) {
if (!arg)
extended_usage++;
free(buf);
if (extended_usage) {
- fputs(("\nExtended options are separated by commas, "
+ fputs(_("\nExtended options are separated by commas, "
"and may take an argument which\n"
"is set off by an equals ('=') sign. "
- "Valid extended options are:\n"), stderr);
- fputs(("\tea_ver=<ea_version (1 or 2)>\n"), stderr);
- fputs(("\tfragcheck\n"), stderr);
- fputs(("\tjournal_only\n"), stderr);
- fputs(("\tdiscard\n"), stderr);
- fputs(("\tnodiscard\n"), stderr);
- fputs(("\treadahead_kb=<buffer size>\n"), stderr);
- fputs(("\tbmap2extent\n"), stderr);
+ "Valid extended options are:\n\n"), stderr);
+ fputs(_("\tea_ver=<ea_version (1 or 2)>\n"), stderr);
+ fputs("\tfragcheck\n", stderr);
+ fputs("\tjournal_only\n", stderr);
+ fputs("\tdiscard\n", stderr);
+ fputs("\tnodiscard\n", stderr);
+ fputs("\toptimize_extents\n", stderr);
+ fputs("\tno_optimize_extents\n", stderr);
+ fputs("\tinode_count_fullmap\n", stderr);
+ fputs("\tno_inode_count_fullmap\n", stderr);
+ fputs(_("\treadahead_kb=<buffer size>\n"), stderr);
+ fputs("\tbmap2extent\n", stderr);
+ fputs("\tfixes_only\n", stderr);
fputc('\n', stderr);
exit(1);
}
if (c)
verbose = 1;
+ profile_get_boolean(ctx->profile, "options", "no_optimize_extents",
+ 0, 0, &c);
+ if (c)
+ ctx->options |= E2F_OPT_NOOPT_EXTENTS;
+
+ profile_get_boolean(ctx->profile, "options", "inode_count_fullmap",
+ 0, 0, &c);
+ if (c)
+ ctx->options |= E2F_OPT_ICOUNT_FULLMAP;
+
if (ctx->readahead_kb == ~0ULL) {
profile_get_integer(ctx->profile, "options",
"readahead_mem_pct", 0, -1, &c);
if (retval)
goto check_error;
- /* Print warning if e2fck will wait for more than 20 secs. */
+ /* Print warning if e2fsck will wait for more than 20 secs. */
if (verbose || wait_time > EXT4_MMP_MIN_CHECK_INTERVAL * 4) {
log_out(ctx, _("MMP interval is %u seconds and total wait "
"time is %u seconds. Please wait...\n"),
int old_bitmaps;
__u32 features[3];
char *cp;
- int qtype = -99; /* quota type */
+ enum quota_type qtype;
clear_problem_context(&pctx);
sigcatcher_setup();
retval = e2fsck_check_ext3_journal(ctx);
if (retval) {
com_err(ctx->program_name, retval,
- _("while checking ext3 journal for %s"),
+ _("while checking journal for %s"),
ctx->device_name);
- fatal_error(ctx, 0);
+ fatal_error(ctx,
+ _("Cannot proceed with file system check"));
}
}
fatal_error(ctx, 0);
}
retval = e2fsck_run_ext3_journal(ctx);
- if (retval) {
+ if (retval == EFSBADCRC) {
+ log_out(ctx, _("Journal checksum error "
+ "found in %s\n"),
+ ctx->device_name);
+ } else if (retval == EFSCORRUPTED) {
+ log_out(ctx, _("Journal corrupted in %s\n"),
+ ctx->device_name);
+ } else if (retval) {
com_err(ctx->program_name, retval,
- _("while recovering ext3 journal of %s"),
+ _("while recovering journal of %s"),
ctx->device_name);
- fatal_error(ctx, 0);
}
ext2fs_close_free(&ctx->fs);
ctx->flags |= E2F_FLAG_RESTARTED;
if (ext2fs_has_feature_quota(sb)) {
/* Quotas were enabled. Do quota accounting during fsck. */
- if ((sb->s_usr_quota_inum && sb->s_grp_quota_inum) ||
- (!sb->s_usr_quota_inum && !sb->s_grp_quota_inum))
- qtype = -1;
- else
- qtype = sb->s_usr_quota_inum ? USRQUOTA : GRPQUOTA;
-
- quota_init_context(&ctx->qctx, ctx->fs, qtype);
+ clear_problem_context(&pctx);
+ pctx.errcode = quota_init_context(&ctx->qctx, ctx->fs, 0);
+ if (pctx.errcode) {
+ fix_problem(ctx, PR_0_QUOTA_INIT_CTX, &pctx);
+ fatal_error(ctx, 0);
+ }
}
run_result = e2fsck_run(ctx);
ctx->device_name : ctx->filesystem_name);
exit_value |= FSCK_CANCELED;
} else if (ctx->qctx && !ctx->invalid_bitmaps) {
- int i, needs_writeout;
+ int needs_writeout;
- for (i = 0; i < MAXQUOTAS; i++) {
- if (qtype != -1 && qtype != i)
+ for (qtype = 0; qtype < MAXQUOTAS; qtype++) {
+ if (*quota_sb_inump(sb, qtype) == 0)
continue;
needs_writeout = 0;
- pctx.num = i;
- retval = quota_compare_and_update(ctx->qctx, i,
+ pctx.num = qtype;
+ retval = quota_compare_and_update(ctx->qctx, qtype,
&needs_writeout);
if ((retval || needs_writeout) &&
- fix_problem(ctx, PR_6_UPDATE_QUOTAS, &pctx))
- quota_write_inode(ctx->qctx, i);
+ fix_problem(ctx, PR_6_UPDATE_QUOTAS, &pctx)) {
+ pctx.errcode = quota_write_inode(ctx->qctx,
+ 1 << qtype);
+ if (pctx.errcode)
+ (void) fix_problem(ctx,
+ PR_6_WRITE_QUOTAS, &pctx);
+ }
}
quota_release_context(&ctx->qctx);
}
ext2fs_mark_super_dirty(fs);
}
- e2fsck_write_bitmaps(ctx);
- if (fs->flags & EXT2_FLAG_DIRTY) {
- pctx.errcode = ext2fs_flush(ctx->fs);
+ if (!(ctx->options & E2F_OPT_READONLY)) {
+ e2fsck_write_bitmaps(ctx);
+ if (fs->flags & EXT2_FLAG_DIRTY) {
+ pctx.errcode = ext2fs_flush(ctx->fs);
+ if (pctx.errcode)
+ fix_problem(ctx, PR_6_FLUSH_FILESYSTEM, &pctx);
+ }
+ pctx.errcode = io_channel_flush(ctx->fs->io);
if (pctx.errcode)
- fix_problem(ctx, PR_6_FLUSH_FILESYSTEM, &pctx);
+ fix_problem(ctx, PR_6_IO_FLUSH, &pctx);
}
- pctx.errcode = io_channel_flush(ctx->fs->io);
- if (pctx.errcode)
- fix_problem(ctx, PR_6_IO_FLUSH, &pctx);
if (was_changed) {
- exit_value |= FSCK_NONDESTRUCT;
- if (!(ctx->options & E2F_OPT_PREEN))
- log_out(ctx, _("\n%s: ***** FILE SYSTEM WAS "
- "MODIFIED *****\n"),
+ int fs_fixed = (ctx->flags & E2F_FLAG_PROBLEMS_FIXED);
+
+ if (fs_fixed)
+ exit_value |= FSCK_NONDESTRUCT;
+ if (!(ctx->options & E2F_OPT_PREEN)) {
+#if 0 /* Do this later; it breaks too many tests' golden outputs */
+ log_out(ctx, fs_fixed ?
+ _("\n%s: ***** FILE SYSTEM ERRORS "
+ "CORRECTED *****\n") :
+ _("%s: File system was modified.\n"),
+ ctx->device_name);
+#else
+ log_out(ctx,
+ _("\n%s: ***** FILE SYSTEM WAS MODIFIED *****\n"),
ctx->device_name);
+#endif
+ }
if (ctx->mount_flags & EXT2_MF_ISROOT) {
- log_out(ctx, _("%s: ***** REBOOT LINUX *****\n"),
+ log_out(ctx, _("%s: ***** REBOOT SYSTEM *****\n"),
ctx->device_name);
exit_value |= FSCK_REBOOT;
}
ext2fs_close_free(&ctx->fs);
free(ctx->journal_name);
+ if (ctx->logf)
+ fprintf(ctx->logf, "Exit status: %d\n", exit_value);
e2fsck_free_context(ctx);
remove_error_table(&et_ext2_error_table);
remove_error_table(&et_prof_error_table);
projects / thirdparty / e2fsprogs.git / blobdiff