diff options
| -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) { |