diff options
| author | Lukas Czerner <lczerner@redhat.com> | 2012-03-11 15:35:06 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2012-03-11 15:38:28 -0400 |
| commit | f0fe5daecdb0c88afb76c23c77494bbe86e1cd2b (patch) | |
| tree | 3035296461b3357a3d46b22f9117808d918d52e0 | |
| parent | d2c9c42a0b1c0776afe47c9bfbddbc170d8aa036 (diff) | |
| download | e2fsprogs-f0fe5daecdb0c88afb76c23c77494bbe86e1cd2b.tar.gz | |
e2fsck: do not discard when in read only mode
When argument '-n' was specified and should run in read-only mode, we
should not attempt to discard anything. In order to do that we have to
check for E2F_OPT_NO flag and clear E2F_OPT_DISCARD flag if E2F_OPT_NO
is set.
This commit fixes the problem when we would mark inode tables as zeroed
(EXT2_BG_INODE_ZEROED) even when e2fsck is running in read-only mode. We
also move the check for E2F_OPT_NO so we can clear E2F_OPT_DISCARD as
early as possible.
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | e2fsck/pass5.c | 5 | ||||
| -rw-r--r-- | e2fsck/unix.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c index c121d92b..6fd9ecc6 100644 --- a/e2fsck/pass5.c +++ b/e2fsck/pass5.c @@ -88,8 +88,7 @@ static void e2fsck_discard_blocks(e2fsck_t ctx, blk64_t start, if (ext2fs_test_changed(fs)) ctx->options &= ~E2F_OPT_DISCARD; - if (!(ctx->options & E2F_OPT_NO) && - (ctx->options & E2F_OPT_DISCARD) && + if ((ctx->options & E2F_OPT_DISCARD) && (io_channel_discard(fs->io, start, count))) ctx->options &= ~E2F_OPT_DISCARD; } @@ -117,7 +116,7 @@ static void e2fsck_discard_inodes(e2fsck_t ctx, int group, ctx->options &= ~E2F_OPT_DISCARD; } - if ((ctx->options & E2F_OPT_NO) || !(ctx->options & E2F_OPT_DISCARD)) + if (!(ctx->options & E2F_OPT_DISCARD)) return; /* diff --git a/e2fsck/unix.c b/e2fsck/unix.c index 6f97b0f2..b31a1e31 100644 --- a/e2fsck/unix.c +++ b/e2fsck/unix.c @@ -903,6 +903,11 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx) profile_set_syntax_err_cb(syntax_err_report); profile_init(config_fn, &ctx->profile); + /* Turn off discard in read-only mode */ + if ((ctx->options & E2F_OPT_NO) && + (ctx->options & E2F_OPT_DISCARD)) + ctx->options &= ~E2F_OPT_DISCARD; + if (flush) { fd = open(ctx->filesystem_name, O_RDONLY, 0); if (fd < 0) { |