From e39ac92269d645bd279c2660d127b47159b8b1f9 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 5 May 2001 06:47:24 +0000 Subject: [PATCH] ChangeLog, util.c: util.c (fatal_error): Use the correct magic number when checking the magic number for the io_channel data structure. Also remove extraneous call to io_channel_flush() that was left over from an editing session. --- e2fsck/ChangeLog | 5 +++++ e2fsck/util.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog index d08bd3a..ae3f10c 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,5 +1,10 @@ 2001-05-05 Theodore Tso + * util.c (fatal_error): Use the correct magic number when checking + the magic number for the io_channel data structure. Also + remove extraneous call to io_channel_flush() that was left + over from an editing session. + * pass2.c (check_dir_block): Ignore EXT2_ET_DIR_CORRUPTED errors from ext2fs_read_dir_block(). diff --git a/e2fsck/util.c b/e2fsck/util.c index 517aa6e..13fd926 100644 --- a/e2fsck/util.c +++ b/e2fsck/util.c @@ -39,10 +39,8 @@ void fatal_error(e2fsck_t ctx, const char *msg) { if (msg) fprintf (stderr, "e2fsck: %s\n", msg); - if (ctx->fs && ctx->fs->io) - io_channel_flush(ctx->fs->io); if (ctx->fs && ctx->fs->io) { - if (ctx->fs->io->magic == EXT2_ET_MAGIC_IO_MANAGER) + if (ctx->fs->io->magic == EXT2_ET_MAGIC_IO_CHANNEL) io_channel_flush(ctx->fs->io); else fprintf(stderr, "e2fsck: io manager magic bad!\n"); -- 1.8.3.1