aboutsummaryrefslogtreecommitdiffstats
path: root/e2fsck/unix.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2014-08-15 19:01:24 -0400
committerTheodore Ts'o <tytso@mit.edu>2014-08-15 19:01:24 -0400
commitaef977196a9ab297ce274951f3d8edd8434a96d4 (patch)
tree83612767bd24249f7c9279b27b9e829541a9080f /e2fsck/unix.c
parent68083287ae95dce9b610c94b28f95cb702d4c98f (diff)
parentc47cd4f28768bd3768c1074ac6b9274fcfddd3cd (diff)
downloadandroid_external_e2fsprogs-aef977196a9ab297ce274951f3d8edd8434a96d4.tar.gz
android_external_e2fsprogs-aef977196a9ab297ce274951f3d8edd8434a96d4.tar.bz2
android_external_e2fsprogs-aef977196a9ab297ce274951f3d8edd8434a96d4.zip
Merge branch 'maint' into next
Diffstat (limited to 'e2fsck/unix.c')
-rw-r--r--e2fsck/unix.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index c1d5b62d..1a089a94 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -1734,9 +1734,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);