diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-03 21:52:52 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2018-11-03 21:55:33 -0400 |
| commit | f363ed0766c90443ffb6bbfa4e1cab85f4aac4e8 (patch) | |
| tree | b30cead5f94e023379ff3074dc6e423ba5f889f1 | |
| parent | 167558dc63d8e6005806289bc1a657e319972423 (diff) | |
bcachefs: Rename nofsck opt to fsck
| -rw-r--r-- | fs/bcachefs/fsck.c | 2 | ||||
| -rw-r--r-- | fs/bcachefs/opts.h | 4 | ||||
| -rw-r--r-- | fs/bcachefs/recovery.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c index e82e272359ee..be7ba06418e4 100644 --- a/fs/bcachefs/fsck.c +++ b/fs/bcachefs/fsck.c @@ -1464,7 +1464,7 @@ static int bch2_fsck_walk_inodes_only(struct bch_fs *c) int bch2_fsck(struct bch_fs *c) { - if (!c->opts.nofsck) + if (c->opts.fsck) return bch2_fsck_full(c); if (!c->sb.clean && diff --git a/fs/bcachefs/opts.h b/fs/bcachefs/opts.h index 79b16fe73da6..81c660838f57 100644 --- a/fs/bcachefs/opts.h +++ b/fs/bcachefs/opts.h @@ -152,9 +152,9 @@ enum opt_type { BCH_OPT(journal_flush_disabled, u8, OPT_RUNTIME, \ OPT_BOOL(), \ NO_SB_OPT, false) \ - BCH_OPT(nofsck, u8, OPT_MOUNT, \ + BCH_OPT(fsck, u8, OPT_MOUNT, \ OPT_BOOL(), \ - NO_SB_OPT, false) \ + NO_SB_OPT, true) \ BCH_OPT(fix_errors, u8, OPT_MOUNT, \ OPT_BOOL(), \ NO_SB_OPT, false) \ diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 2b053e61bde7..95b4e244429d 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -151,7 +151,7 @@ int bch2_fs_recovery(struct bch_fs *c) bch_info(c, "recovering from clean shutdown, journal seq %llu", le64_to_cpu(clean->journal_seq)); - if (!clean || !c->opts.nofsck) { + if (!clean || c->opts.fsck) { ret = bch2_journal_read(c, &journal); if (ret) goto err; |