#ifdef HAVE_MNTENT_H
#include <mntent.h>
#endif
+#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_DIRENT_H
+#include <dirent.h>
+#endif
#include "et/com_err.h"
#include "e2fsck.h"
#include "../version.h"
/* Command line options */
-static int swapfs = 0;
-static int normalize_swapfs = 0;
-static int cflag = 0; /* check disk */
-static int show_version_only = 0;
-static int verbose = 0;
+static int swapfs;
+static int normalize_swapfs;
+static int cflag; /* check disk */
+static int show_version_only;
+static int verbose;
-static int replace_bad_blocks = 0;
-static char *bad_blocks_file = 0;
+static int replace_bad_blocks;
+static int keep_bad_blocks;
+static char *bad_blocks_file;
e2fsck_t e2fsck_global_ctx; /* Try your very best not to use this! */
fprintf(stderr,
_("Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
"\t\t[-I inode_buffer_blocks] [-P process_inode_size]\n"
- "\t\t[-l|-L bad_blocks_file] [-C fd] [-j ext-journal]\n"
+ "\t\t[-l|-L bad_blocks_file] [-C fd] [-j external_journal]\n"
"\t\t[-E extended-options] device\n"),
ctx->program_name);
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
" -B blocksize Force blocksize when looking for superblock\n"
- " -j external-journal Set location of the external journal\n"
+ " -j external_journal Set location of the external journal\n"
" -l bad_blocks_file Add to badblocks list\n"
" -L bad_blocks_file Set badblocks list\n"
));
static void show_stats(e2fsck_t ctx)
{
ext2_filsys fs = ctx->fs;
- int inodes, inodes_used, blocks, blocks_used;
+ ext2_ino_t inodes, inodes_used;
+ blk_t blocks, blocks_used;
int dir_links;
int num_files, num_links;
int frag_percent;
frag_percent = (frag_percent + 5) / 10;
if (!verbose) {
- printf(_("%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"),
+ printf(_("%s: %u/%u files (%0d.%d%% non-contiguous), %u/%u blocks\n"),
ctx->device_name, inodes_used, inodes,
frag_percent / 10, frag_percent % 10,
blocks_used, blocks);
return;
}
- /*
- * This is a bit ugly. But I think there will nearly always be more
- * than one "thing" to report about, so I won't try writing complex
- * code to handle one/two/many forms of all words.
- * Some languages (Italian, at least) never uses the plural form
- * of foreign words, so in real life this could not be a problem.
- * md@linux.it - 2000-1-15
- */
-#ifdef ENABLE_NLS
- printf (_("\n%8d inodes used (%d%%)\n"), inodes_used,
- 100 * inodes_used / inodes);
- printf (_("%8d non-contiguous inodes (%0d.%d%%)\n"),
+ printf (P_("\n%8u inode used (%2.2f%%)\n", "\n%8u inodes used (%2.2f%%)\n",
+ inodes_used), inodes_used, 100.0 * inodes_used / inodes);
+ printf (P_("%8u non-contiguous inode (%0d.%d%%)\n",
+ "%8u non-contiguous inodes (%0d.%d%%)\n",
+ ctx->fs_fragmented),
ctx->fs_fragmented, frag_percent / 10, frag_percent % 10);
- printf (_(" # of inodes with ind/dind/tind blocks: %d/%d/%d\n"),
+ printf (_(" # of inodes with ind/dind/tind blocks: %u/%u/%u\n"),
ctx->fs_ind_count, ctx->fs_dind_count, ctx->fs_tind_count);
- printf (_("%8d blocks used (%d%%)\n"
- "%8d bad blocks\n"), blocks_used,
- (int) ((long long) 100 * blocks_used / blocks),
- ctx->fs_badblocks_count);
- printf(_("%8d large files\n"), ctx->large_files);
- printf (_("\n%8d regular files\n"
- "%8d directories\n"
- "%8d character device files\n"
- "%8d block device files\n"
- "%8d fifos\n"
- "%8d links\n"
- "%8d symbolic links (%d fast symbolic links)\n"
- "%8d sockets\n"
- "--------\n"
- "%8d files\n"),
- ctx->fs_regular_count,
- ctx->fs_directory_count,
- ctx->fs_chardev_count,
- ctx->fs_blockdev_count,
- ctx->fs_fifo_count,
- ctx->fs_links_count - dir_links,
- ctx->fs_symlinks_count,
- ctx->fs_fast_symlinks_count,
- ctx->fs_sockets_count,
+ printf (P_("%8u block used (%2.2f%%)\n", "%8u blocks used (%2.2f%%)\n",
+ blocks_used), blocks_used, 100.0 * blocks_used / blocks);
+ printf (P_("%8u bad block\n", "%8u bad blocks\n",
+ ctx->fs_badblocks_count), ctx->fs_badblocks_count);
+ printf (P_("%8u large file\n", "%8u large files\n",
+ ctx->large_files), ctx->large_files);
+ printf (P_("\n%8u regular file\n", "\n%8u regular files\n",
+ ctx->fs_regular_count), ctx->fs_regular_count);
+ printf (P_("%8u directory\n", "%8u directories\n",
+ ctx->fs_directory_count), ctx->fs_directory_count);
+ printf (P_("%8u character device file\n",
+ "%8u character device files\n", ctx->fs_chardev_count),
+ ctx->fs_chardev_count);
+ printf (P_("%8u block device file\n", "%8u block device files\n",
+ ctx->fs_blockdev_count), ctx->fs_blockdev_count);
+ printf (P_("%8u fifo\n", "%8u fifos\n", ctx->fs_fifo_count),
+ ctx->fs_fifo_count);
+ printf (P_("%8u link\n", "%8u links\n",
+ ctx->fs_links_count - dir_links),
+ ctx->fs_links_count - dir_links);
+ printf (P_("%8u symbolic link", "%8u symbolic links",
+ ctx->fs_symlinks_count), ctx->fs_symlinks_count);
+ printf (P_(" (%u fast symbolic link)\n", " (%u fast symbolic links)\n",
+ ctx->fs_fast_symlinks_count), ctx->fs_fast_symlinks_count);
+ printf (P_("%8u socket\n", "%8u sockets\n", ctx->fs_sockets_count),
+ ctx->fs_sockets_count);
+ printf ("--------\n");
+ printf (P_("%8u file\n", "%8u files\n",
+ ctx->fs_total_count - dir_links),
ctx->fs_total_count - dir_links);
-#else
- printf ("\n%8d inode%s used (%d%%)\n", inodes_used,
- (inodes_used != 1) ? "s" : "",
- 100 * inodes_used / inodes);
- printf ("%8d non-contiguous inodes (%0d.%d%%)\n",
- ctx->fs_fragmented, frag_percent / 10, frag_percent % 10);
- printf (" # of inodes with ind/dind/tind blocks: %d/%d/%d\n",
- ctx->fs_ind_count, ctx->fs_dind_count, ctx->fs_tind_count);
- printf ("%8d block%s used (%d%%)\n"
- "%8d bad block%s\n", blocks_used,
- (blocks_used != 1) ? "s" : "",
- 100 * blocks_used / blocks, ctx->fs_badblocks_count,
- ctx->fs_badblocks_count != 1 ? "s" : "");
- printf(_("%8d large file%s\n"), ctx->large_files,
- (ctx->large_files != 1) ? "s" : "");
- printf ("\n%8d regular file%s\n"
- "%8d director%s\n"
- "%8d character device file%s\n"
- "%8d block device file%s\n"
- "%8d fifo%s\n"
- "%8d link%s\n"
- "%8d symbolic link%s (%d fast symbolic link%s)\n"
- "%8d socket%s\n"
- "--------\n"
- "%8d file%s\n",
- ctx->fs_regular_count,
- (ctx->fs_regular_count != 1) ? "s" : "",
- ctx->fs_directory_count,
- (ctx->fs_directory_count != 1) ? "ies" : "y",
- ctx->fs_chardev_count,
- (ctx->fs_chardev_count != 1) ? "s" : "",
- ctx->fs_blockdev_count,
- (ctx->fs_blockdev_count != 1) ? "s" : "",
- ctx->fs_fifo_count,
- (ctx->fs_fifo_count != 1) ? "s" : "",
- ctx->fs_links_count - dir_links,
- ((ctx->fs_links_count - dir_links) != 1) ? "s" : "",
- ctx->fs_symlinks_count,
- (ctx->fs_symlinks_count != 1) ? "s" : "",
- ctx->fs_fast_symlinks_count,
- (ctx->fs_fast_symlinks_count != 1) ? "s" : "",
- ctx->fs_sockets_count, (ctx->fs_sockets_count != 1) ? "s" : "",
- ctx->fs_total_count - dir_links,
- ((ctx->fs_total_count - dir_links) != 1) ? "s" : "");
-#endif
}
static void check_mount(e2fsck_t ctx)
}
/*
- * If the filesystem isn't mounted, or it's the root filesystem
- * and it's mounted read-only, then everything's fine.
+ * If the filesystem isn't mounted, or it's the root
+ * filesystem and it's mounted read-only, and we're not doing
+ * a read/write check, then everything's fine.
*/
if ((!(ctx->mount_flags & EXT2_MF_MOUNTED)) ||
((ctx->mount_flags & EXT2_MF_ISROOT) &&
- (ctx->mount_flags & EXT2_MF_READONLY)))
+ (ctx->mount_flags & EXT2_MF_READONLY) &&
+ !(ctx->options & E2F_OPT_WRITECHECK)))
return;
- if (ctx->options & E2F_OPT_READONLY) {
+ if ((ctx->options & E2F_OPT_READONLY) &&
+ !(ctx->options & E2F_OPT_WRITECHECK)) {
printf(_("Warning! %s is mounted.\n"), ctx->filesystem_name);
return;
}
printf(_("%s is mounted. "), ctx->filesystem_name);
- if (!isatty(0) || !isatty(1))
+ if (!ctx->interactive)
fatal_error(ctx, _("Cannot continue, aborting.\n\n"));
printf(_("\n\n\007\007\007\007WARNING!!! "
"Running e2fsck on a mounted filesystem may cause\n"
return;
}
+static int is_on_batt(void)
+{
+ FILE *f;
+ DIR *d;
+ char tmp[80], tmp2[80], fname[80];
+ unsigned int acflag;
+ struct dirent* de;
+
+ f = fopen("/proc/apm", "r");
+ if (f) {
+ if (fscanf(f, "%s %s %s %x", tmp, tmp, tmp, &acflag) != 4)
+ acflag = 1;
+ fclose(f);
+ return (acflag != 1);
+ }
+ d = opendir("/proc/acpi/ac_adapter");
+ if (d) {
+ while ((de=readdir(d)) != NULL) {
+ if (!strncmp(".", de->d_name, 1))
+ continue;
+ snprintf(fname, 80, "/proc/acpi/ac_adapter/%s/state",
+ de->d_name);
+ f = fopen(fname, "r");
+ if (!f)
+ continue;
+ if (fscanf(f, "%s %s", tmp2, tmp) != 2)
+ tmp[0] = 0;
+ fclose(f);
+ if (strncmp(tmp, "off-line", 8) == 0) {
+ closedir(d);
+ return 1;
+ }
+ }
+ closedir(d);
+ }
+ return 0;
+}
+
/*
* This routine checks to see if a filesystem can be skipped; if so,
* it will exit with E2FSCK_OK. Under some conditions it will print a
ext2_filsys fs = ctx->fs;
const char *reason = NULL;
unsigned int reason_arg = 0;
-
+ long next_check;
+ int batt = is_on_batt();
+ int defer_check_on_battery;
+
+ profile_get_boolean(ctx->profile, "options",
+ "defer_check_on_battery", 0, 1,
+ &defer_check_on_battery);
+ if (!defer_check_on_battery)
+ batt = 0;
+
if ((ctx->options & E2F_OPT_FORCE) || bad_blocks_file ||
cflag || swapfs)
return;
- if (fs->super->s_state & EXT2_ERROR_FS)
+ if ((fs->super->s_state & EXT2_ERROR_FS) ||
+ !ext2fs_test_valid(fs))
reason = _(" contains a file system with errors");
else if ((fs->super->s_state & EXT2_VALID_FS) == 0)
reason = _(" was not cleanly unmounted");
(unsigned) fs->super->s_max_mnt_count)) {
reason = _(" has been mounted %u times without being checked");
reason_arg = fs->super->s_mnt_count;
+ if (batt && (fs->super->s_mnt_count <
+ (unsigned) fs->super->s_max_mnt_count*2))
+ reason = 0;
} else if (fs->super->s_checkinterval &&
- time(0) >= (fs->super->s_lastcheck +
- fs->super->s_checkinterval)) {
+ ((ctx->now - fs->super->s_lastcheck) >=
+ fs->super->s_checkinterval)) {
reason = _(" has gone %u days without being checked");
- reason_arg = (time(0) - fs->super->s_lastcheck)/(3600*24);
+ reason_arg = (ctx->now - fs->super->s_lastcheck)/(3600*24);
+ if (batt && ((ctx->now - fs->super->s_lastcheck) <
+ fs->super->s_checkinterval*2))
+ reason = 0;
}
if (reason) {
fputs(ctx->device_name, stdout);
fputs(_(", check forced.\n"), stdout);
return;
}
- printf(_("%s: clean, %d/%d files, %d/%d blocks\n"), ctx->device_name,
+ printf(_("%s: clean, %u/%u files, %u/%u blocks"), ctx->device_name,
fs->super->s_inodes_count - fs->super->s_free_inodes_count,
fs->super->s_inodes_count,
fs->super->s_blocks_count - fs->super->s_free_blocks_count,
fs->super->s_blocks_count);
+ next_check = 100000;
+ if (fs->super->s_max_mnt_count > 0) {
+ next_check = fs->super->s_max_mnt_count - fs->super->s_mnt_count;
+ if (next_check <= 0)
+ next_check = 1;
+ }
+ if (fs->super->s_checkinterval &&
+ ((ctx->now - fs->super->s_lastcheck) >= fs->super->s_checkinterval))
+ next_check = 1;
+ if (next_check <= 5) {
+ if (next_check == 1) {
+ if (batt)
+ fputs(_(" (check deferred; on battery)"),
+ stdout);
+ else
+ fputs(_(" (check after next mount)"), stdout);
+ } else
+ printf(_(" (check in %ld mounts)"), next_check);
+ }
+ fputc('\n', stdout);
ext2fs_close(fs);
ctx->fs = NULL;
e2fsck_free_context(ctx);
struct percent_tbl e2fsck_tbl = {
5, { 0, 70, 90, 92, 95, 100 }
};
-static char bar[] =
- "==============================================================="
- "===============================================================";
-static char spaces[] =
- " "
- " ";
+static char bar[128], spaces[128];
static float calc_percent(struct percent_tbl *tbl, int pass, int curr,
int max)
if (!(ctx->flags & E2F_FLAG_PROG_BAR))
return;
- printf("%s\r", spaces + (sizeof(spaces) - 80));
+ printf("%s%s\r%s", ctx->start_meta, spaces + (sizeof(spaces) - 80),
+ ctx->stop_meta);
+ fflush(stdout);
ctx->flags &= ~E2F_FLAG_PROG_BAR;
}
-int e2fsck_simple_progress(e2fsck_t ctx, char *label, float percent,
+int e2fsck_simple_progress(e2fsck_t ctx, const char *label, float percent,
unsigned int dpynum)
{
static const char spinner[] = "\\|/-";
- char buf[80];
int i;
- int tick;
+ unsigned int tick;
struct timeval tv;
int dpywidth;
+ int fixed_percent;
if (ctx->flags & E2F_FLAG_PROG_SUPPRESS)
return 0;
* percentage hasn't changed, then we skip out right
* away.
*/
- if (ctx->progress_last_percent == (int) 10 * percent)
+ fixed_percent = (int) ((10 * percent) + 0.5);
+ if (ctx->progress_last_percent == fixed_percent)
return 0;
- ctx->progress_last_percent = (int) 10 * percent;
+ ctx->progress_last_percent = fixed_percent;
/*
* If we've already updated the spinner once within
gettimeofday(&tv, NULL);
tick = (tv.tv_sec << 3) + (tv.tv_usec / (1000000 / 8));
if ((tick == ctx->progress_last_time) &&
- (percent != 0.0) && (percent != 100.0))
+ (fixed_percent != 0) && (fixed_percent != 1000))
return 0;
ctx->progress_last_time = tick;
dpywidth -= 8;
i = ((percent * dpywidth) + 50) / 100;
- printf("%s: |%s%s", label, bar + (sizeof(bar) - (i+1)),
+ printf("%s%s: |%s%s", ctx->start_meta, label,
+ bar + (sizeof(bar) - (i+1)),
spaces + (sizeof(spaces) - (dpywidth - i + 1)));
- if (percent == 100.0)
+ if (fixed_percent == 1000)
fputc('|', stdout);
else
fputc(spinner[ctx->progress_pos & 3], stdout);
+ printf(" %4.1f%% ", percent);
if (dpynum)
- printf(" %4.1f%% %u\r", percent, dpynum);
+ printf("%u\r", dpynum);
else
- printf(" %4.1f%% \r", percent);
+ fputs(" \r", stdout);
+ fputs(ctx->stop_meta, stdout);
- if (percent == 100.0)
+ if (fixed_percent == 1000)
e2fsck_clear_progbar(ctx);
fflush(stdout);
static int e2fsck_update_progress(e2fsck_t ctx, int pass,
unsigned long cur, unsigned long max)
{
- static const char spinner[] = "\\|/-";
char buf[80];
- int i;
float percent;
- int tick;
- struct timeval tv;
- static int dpywidth = 0;
if (pass == 0)
return 0;
}
#ifdef HAVE_SIGNAL_H
-static void signal_progress_on(int sig)
+static void signal_progress_on(int sig EXT2FS_ATTR((unused)))
{
e2fsck_t ctx = e2fsck_global_ctx;
ctx->progress_fd = 0;
}
-static void signal_progress_off(int sig)
+static void signal_progress_off(int sig EXT2FS_ATTR((unused)))
{
e2fsck_t ctx = e2fsck_global_ctx;
ctx->progress = 0;
}
-static void signal_cancel(int sig)
+static void signal_cancel(int sig EXT2FS_ATTR((unused)))
{
e2fsck_t ctx = e2fsck_global_ctx;
if (p) {
*p = 0;
next = p+1;
- }
+ }
arg = strchr(token, '=');
if (arg) {
*arg = 0;
continue;
}
ctx->ext_attr_ver = ea_ver;
- } else
+ } else {
+ fprintf(stderr, _("Unknown extended option: %s\n"),
+ token);
extended_usage++;
+ }
}
+ free(buf);
+
if (extended_usage) {
- fprintf(stderr, _("Extended options are separated by commas, "
- "and may take an argument which\n"
- "is set off by an equals ('=') sign. "
- "Valid raid options are:\n"
- "\tea_ver=<ea_version (1 or 2)\n\n"));
+ 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"
+ "\tea_ver=<ea_version (1 or 2)>\n\n"), stderr);
exit(1);
}
-}
+}
+static void syntax_err_report(const char *filename, long err, int line_num)
+{
+ fprintf(stderr,
+ _("Syntax error in e2fsck config file (%s, line #%d)\n\t%s\n"),
+ filename, line_num, error_message(err));
+ exit(FSCK_ERROR);
+}
+
+static const char *config_fn[] = { ROOT_SYSCONFDIR "/e2fsck.conf", 0 };
static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
{
struct sigaction sa;
#endif
char *extended_opts = 0;
+ char *cp;
retval = e2fsck_allocate_context(&ctx);
if (retval)
*ret_ctx = ctx;
- setbuf(stdout, NULL);
- setbuf(stderr, NULL);
- initialize_ext2_error_table();
+ setvbuf(stdout, NULL, _IONBF, BUFSIZ);
+ setvbuf(stderr, NULL, _IONBF, BUFSIZ);
+ if (isatty(0) && isatty(1)) {
+ ctx->interactive = 1;
+ } else {
+ ctx->start_meta[0] = '\001';
+ ctx->stop_meta[0] = '\002';
+ }
+ memset(bar, '=', sizeof(bar)-1);
+ memset(spaces, ' ', sizeof(spaces)-1);
+ add_error_table(&et_ext2_error_table);
+ add_error_table(&et_prof_error_table);
blkid_get_cache(&ctx->blkid, NULL);
if (argc && *argv)
ctx->program_name = *argv;
else
ctx->program_name = "e2fsck";
- while ((c = getopt (argc, argv, "panyrcC:B:dE:fvtFVM:b:I:j:P:l:L:N:SsD")) != EOF)
+ while ((c = getopt (argc, argv, "panyrcC:B:dE:fvtFVM:b:I:j:P:l:L:N:SsDk")) != EOF)
switch (c) {
case 'C':
ctx->progress = e2fsck_update_progress;
if (ctx->options & (E2F_OPT_YES|E2F_OPT_NO)) {
conflict_opt:
fatal_error(ctx,
- _("Only one the options -p/-a, -n or -y may be specified."));
+ _("Only one of the options -p/-a, -n or -y may be specified."));
}
ctx->options |= E2F_OPT_PREEN;
break;
"of e2fsck\n"));
exit(1);
#endif
+ case 'k':
+ keep_bad_blocks++;
+ break;
default:
usage(ctx);
}
if ((ctx->options & E2F_OPT_NO) && !bad_blocks_file &&
!cflag && !swapfs && !(ctx->options & E2F_OPT_COMPRESS_DIRS))
ctx->options |= E2F_OPT_READONLY;
+ ctx->io_options = strchr(argv[optind], '?');
+ if (ctx->io_options)
+ *ctx->io_options++ = 0;
ctx->filesystem_name = blkid_get_devname(ctx->blkid, argv[optind], 0);
+ if (!ctx->filesystem_name) {
+ com_err(ctx->program_name, 0, _("Unable to resolve '%s'"),
+ argv[optind]);
+ fatal_error(ctx, 0);
+ }
if (extended_opts)
parse_extended_opts(ctx, extended_opts);
-
+
+ if ((cp = getenv("E2FSCK_CONFIG")) != NULL)
+ config_fn[0] = cp;
+ profile_set_syntax_err_cb(syntax_err_report);
+ profile_init(config_fn, &ctx->profile);
+
if (flush) {
fd = open(ctx->filesystem_name, O_RDONLY, 0);
if (fd < 0) {
/* Update our PATH to include /sbin if we need to run badblocks */
if (cflag) {
char *oldpath = getenv("PATH");
+ char *newpath;
+ int len = sizeof(PATH_SET) + 1;
+
+ if (oldpath)
+ len += strlen(oldpath);
+
+ newpath = malloc(len);
+ if (!newpath)
+ fatal_error(ctx, "Couldn't malloc() newpath");
+ strcpy(newpath, PATH_SET);
+
if (oldpath) {
- char *newpath;
-
- newpath = (char *) malloc(sizeof (PATH_SET) + 1 +
- strlen (oldpath));
- if (!newpath)
- fatal_error(ctx, "Couldn't malloc() newpath");
- strcpy (newpath, PATH_SET);
- strcat (newpath, ":");
- strcat (newpath, oldpath);
- putenv (newpath);
- } else
- putenv (PATH_SET);
+ strcat(newpath, ":");
+ strcat(newpath, oldpath);
+ }
+ putenv(newpath);
}
#ifdef CONFIG_JBD_DEBUG
if (getenv("E2FSCK_JBD_DEBUG"))
#endif
if (!(ctx->options & E2F_OPT_PREEN) || show_version_only)
- fprintf (stderr, "e2fsck %s (%s)\n", my_ver_string,
+ fprintf(stderr, "e2fsck %s (%s)\n", my_ver_string,
my_ver_date);
if (show_version_only) {
if (!(ctx->options & E2F_OPT_PREEN) &&
!(ctx->options & E2F_OPT_NO) &&
!(ctx->options & E2F_OPT_YES)) {
- if (!isatty (0) || !isatty (1))
+ if (!ctx->interactive)
fatal_error(ctx,
_("need terminal for interactive repairs"));
}
ctx->superblock = ctx->use_superblock;
restart:
-#if 1
- io_ptr = unix_io_manager;
-#else
+#ifdef CONFIG_TESTIO_DEBUG
io_ptr = test_io_manager;
test_io_backing_manager = unix_io_manager;
+#else
+ io_ptr = unix_io_manager;
#endif
flags = 0;
if ((ctx->options & E2F_OPT_READONLY) == 0)
flags |= EXT2_FLAG_RW;
+ if ((ctx->mount_flags & EXT2_MF_MOUNTED) == 0)
+ flags |= EXT2_FLAG_EXCLUSIVE;
if (ctx->superblock && ctx->blocksize) {
- retval = ext2fs_open(ctx->filesystem_name, flags,
- ctx->superblock, ctx->blocksize,
- io_ptr, &fs);
+ retval = ext2fs_open2(ctx->filesystem_name, ctx->io_options,
+ flags, ctx->superblock, ctx->blocksize,
+ io_ptr, &fs);
} else if (ctx->superblock) {
int blocksize;
for (blocksize = EXT2_MIN_BLOCK_SIZE;
blocksize <= EXT2_MAX_BLOCK_SIZE; blocksize *= 2) {
- retval = ext2fs_open(ctx->filesystem_name, flags,
- ctx->superblock, blocksize,
- io_ptr, &fs);
+ retval = ext2fs_open2(ctx->filesystem_name,
+ ctx->io_options, flags,
+ ctx->superblock, blocksize,
+ io_ptr, &fs);
if (!retval)
break;
}
} else
- retval = ext2fs_open(ctx->filesystem_name, flags,
- 0, 0, io_ptr, &fs);
+ retval = ext2fs_open2(ctx->filesystem_name, ctx->io_options,
+ flags, 0, 0, io_ptr, &fs);
if (!ctx->superblock && !(ctx->options & E2F_OPT_PREEN) &&
!(ctx->flags & E2F_FLAG_SB_SPECIFIED) &&
((retval == EXT2_ET_BAD_MAGIC) ||
"r/o" : "r/w");
else if (retval == ENXIO)
printf(_("Possibly non-existent or swap device?\n"));
+ else if (retval == EBUSY)
+ printf(_("Filesystem mounted or opened exclusively "
+ "by another program?\n"));
#ifdef EROFS
else if (retval == EROFS)
printf(_("Disk write-protected; use the -n option "
fix_problem(ctx, PR_0_SB_CORRUPT, &pctx);
fatal_error(ctx, 0);
}
+ /*
+ * We only update the master superblock because (a) paranoia;
+ * we don't want to corrupt the backup superblocks, and (b) we
+ * don't need to update the mount count and last checked
+ * fields in the backup superblock (the kernel doesn't update
+ * the backup superblocks anyway). With newer versions of the
+ * library this flag is set by ext2fs_open2(), but we set this
+ * here just to be sure. (No, we don't support e2fsck running
+ * with some other libext2fs than the one that it was shipped
+ * with, but just in case....)
+ */
+ fs->flags |= EXT2_FLAG_MASTER_SB_ONLY;
+
+ if (!(ctx->flags & E2F_FLAG_GOT_DEVSIZE)) {
+ __u32 blocksize = EXT2_BLOCK_SIZE(fs->super);
+ int need_restart = 0;
+
+ pctx.errcode = ext2fs_get_device_size(ctx->filesystem_name,
+ blocksize,
+ &ctx->num_blocks);
+ /*
+ * The floppy driver refuses to allow anyone else to
+ * open the device if has been opened with O_EXCL;
+ * this is unlike other block device drivers in Linux.
+ * To handle this, we close the filesystem and then
+ * reopen the filesystem after we get the device size.
+ */
+ if (pctx.errcode == EBUSY) {
+ ext2fs_close(fs);
+ need_restart++;
+ pctx.errcode =
+ ext2fs_get_device_size(ctx->filesystem_name,
+ blocksize,
+ &ctx->num_blocks);
+ }
+ if (pctx.errcode == EXT2_ET_UNIMPLEMENTED)
+ ctx->num_blocks = 0;
+ else if (pctx.errcode) {
+ fix_problem(ctx, PR_0_GETSIZE_ERROR, &pctx);
+ ctx->flags |= E2F_FLAG_ABORT;
+ fatal_error(ctx, 0);
+ return;
+ }
+ ctx->flags |= E2F_FLAG_GOT_DEVSIZE;
+ if (need_restart)
+ goto restart;
+ }
+
ctx->fs = fs;
fs->priv_data = ctx;
+ fs->now = ctx->now;
sb = fs->super;
if (sb->s_rev_level > E2FSCK_CURRENT_REV) {
com_err(ctx->program_name, EXT2_ET_REV_TOO_HIGH,
!(ctx->options & E2F_OPT_READONLY))
ext2fs_mark_super_dirty(fs);
- /*
- * We only update the master superblock because (a) paranoia;
- * we don't want to corrupt the backup superblocks, and (b) we
- * don't need to update the mount count and last checked
- * fields in the backup superblock (the kernel doesn't
- * update the backup superblocks anyway).
- */
- fs->flags |= EXT2_FLAG_MASTER_SB_ONLY;
-
ehandler_init(fs->io);
if (ctx->superblock)
set_latch_flags(PR_LATCH_RELOC, PRL_LATCHED, 0);
+ ext2fs_mark_valid(fs);
check_super_block(ctx);
if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
fatal_error(ctx, 0);
if (bad_blocks_file)
read_bad_blocks_file(ctx, bad_blocks_file, replace_bad_blocks);
else if (cflag)
- test_disk(ctx);
+ read_bad_blocks_file(ctx, 0, !keep_bad_blocks); /* Test disk */
if (ctx->flags & E2F_FLAG_SIGNAL_MASK)
fatal_error(ctx, 0);
#ifdef ENABLE_SWAPFS
exit_value |= FSCK_REBOOT;
}
}
- if (!ext2fs_test_valid(fs)) {
+ if (!ext2fs_test_valid(fs) ||
+ ((exit_value & FSCK_CANCELED) &&
+ (sb->s_state & EXT2_ERROR_FS))) {
printf(_("\n%s: ********** WARNING: Filesystem still has "
"errors **********\n\n"), ctx->device_name);
exit_value |= FSCK_UNCORRECTED;
exit_value &= ~FSCK_NONDESTRUCT;
}
- if (exit_value & FSCK_CANCELED)
+ if (exit_value & FSCK_CANCELED) {
+ int allow_cancellation;
+
+ profile_get_boolean(ctx->profile, "options",
+ "allow_cancellation", 0, 0,
+ &allow_cancellation);
exit_value &= ~FSCK_NONDESTRUCT;
- else {
+ if (allow_cancellation && ext2fs_test_valid(fs) &&
+ (sb->s_state & EXT2_VALID_FS) &&
+ !(sb->s_state & EXT2_ERROR_FS))
+ exit_value = 0;
+ } else {
show_stats(ctx);
if (!(ctx->options & E2F_OPT_READONLY)) {
if (ext2fs_test_valid(fs)) {
} else
sb->s_state &= ~EXT2_VALID_FS;
sb->s_mnt_count = 0;
- sb->s_lastcheck = time(NULL);
+ sb->s_lastcheck = ctx->now;
ext2fs_mark_super_dirty(fs);
}
}
ctx->fs = NULL;
free(ctx->filesystem_name);
free(ctx->journal_name);
- e2fsck_free_context(ctx);
-
+
#ifdef RESOURCE_TRACK
if (ctx->options & E2F_OPT_TIME)
print_resource_track(NULL, &ctx->global_rtrack);
#endif
-
+ e2fsck_free_context(ctx);
+ remove_error_table(&et_ext2_error_table);
+ remove_error_table(&et_prof_error_table);
return exit_value;
}
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff