diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2014-08-12 14:19:37 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2014-08-12 14:19:42 -0400 |
| commit | ab2cd4a4d2924f8d120af5461e78e808e785970a (patch) | |
| tree | d2bbb779ef3aafc103952c23247021ff85720908 /e2fsck | |
| parent | 115d4b4b33540da49e5d04135417392f7c4d54fc (diff) | |
| download | e2fsprogs-ab2cd4a4d2924f8d120af5461e78e808e785970a.tar.gz | |
e2fsck: don't flush the FS unless it's actually dirty
ext2fs_flush2() unconditionally writes the block group descriptors to
disk even if the underlying FS isn't marked dirty. This causes the
following error message on a fsck -n run:
e2fsck 1.43-WIP (09-Jul-2014)
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
Pass 5: Checking group summary information
Error writing block 2 (Attempt to write block to filesystem resulted in short write). Ignore error? no
Error writing block 2 (Attempt to write block to filesystem resulted in short write). Ignore error? no
Error writing file system info: Attempt to write block to filesystem resulted in short write
Since ext2fs_close2() only calls flush if the dirty flag is set,
modify e2fsck to exhibit the same behavior so that we don't spit out
write errors for a read only check.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'e2fsck')
| -rw-r--r-- | e2fsck/unix.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/e2fsck/unix.c b/e2fsck/unix.c index 628faebc..66debcde 100644 --- a/e2fsck/unix.c +++ b/e2fsck/unix.c @@ -1726,9 +1726,11 @@ no_journal: } e2fsck_write_bitmaps(ctx); - pctx.errcode = ext2fs_flush(ctx->fs); - if (pctx.errcode) - fix_problem(ctx, PR_6_FLUSH_FILESYSTEM, &pctx); + 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_IO_FLUSH, &pctx); |