Re: [PATCH] e2fsck: reopen the file system with saved flags after a journal replay

Darrick J. Wong
2014-07-08T17:29:52Z

On Sat, Jul 05, 2014 at 11:09:57PM -0400, Theodore Ts'o wrote:
> After a journal replay, we close and reopen the file system so that
> any changes in the superblock can get reflected in the libext2fs's
> internal data structures. We need to save the flags passed to
> ext2fs_open() that we used when we originally opened the file system.
>
> Otherwise we could end up triggering the following error message when
> checking a large (or bigalloc) file system after an unclean shutdown:
>
> fsck.ext4: Filesystem too large to use legacy bitmaps while trying to re-open

I had a patch in my tree that fixed this too, so you can add:
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

>
> Addresses-Debian-Bug: 744953
> Cc: Андрей Василишин <a.vasilishin@kpi.ua>
> Cc: Jon Severinsson <jon@severinsson.net>
> Cc: 744953@bugs.debian.org
> ---
>
> Distributions will almost certainly want to backport this patch, since
> it breaks running e2fsck on file system with the 64-bit or bigalloc
> feature enabled
>
> e2fsck/e2fsck.h | 1 +
> e2fsck/journal.c | 2 +-
> e2fsck/unix.c | 1 +
> 3 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
> index c71a0a5..998abdc 100644
> --- a/e2fsck/e2fsck.h
> +++ b/e2fsck/e2fsck.h
> @@ -232,6 +232,7 @@ struct e2fsck_struct {
> blk64_t free_blocks;
> ino_t free_inodes;
> int mount_flags;
> + int openfs_flags;
> blkid_cache blkid; /* blkid cache */
>
> #ifdef HAVE_SETJMP_H
> diff --git a/e2fsck/journal.c b/e2fsck/journal.c
> index 905c0bf..9be52cd 100644
> --- a/e2fsck/journal.c
> +++ b/e2fsck/journal.c
> @@ -903,7 +903,7 @@ errcode_t e2fsck_run_ext3_journal(e2fsck_t ctx)
>
> ext2fs_mmp_stop(ctx->fs);
> ext2fs_free(ctx->fs);
> - retval = ext2fs_open(ctx->filesystem_name, EXT2_FLAG_RW,
> + retval = ext2fs_open(ctx->filesystem_name, ctx->openfs_flags,
> ctx->superblock, blocksize, io_ptr,
> &ctx->fs);
> if (retval) {
> diff --git a/e2fsck/unix.c b/e2fsck/unix.c
> index b265c99..03848c7 100644
> --- a/e2fsck/unix.c
> +++ b/e2fsck/unix.c
> @@ -1274,6 +1274,7 @@ restart:
> flags &= ~EXT2_FLAG_EXCLUSIVE;
> }
>
> + ctx->openfs_flags = flags;
> retval = try_open_fs(ctx, flags, io_ptr, &fs);
>
> if (!ctx->superblock && !(ctx->options & E2F_OPT_PREEN) &&
> --
> 2.0.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html