diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-08-28 13:20:31 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-08-28 13:27:50 -0400 |
| commit | 05ef7000f242c003918c8675a0b33670117057ed (patch) | |
| tree | 566e649a055382a8b7ee7935260af465d949844c | |
| parent | ff42726d2c5f672bd5c39cb23f1988f8948bdbbb (diff) | |
bcachefs: Switch reconstruct_alloc to a mount option
Right now this is the only way of repairing bucket gens in the future
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/bcachefs.h | 4 | ||||
| -rw-r--r-- | fs/bcachefs/opts.h | 5 | ||||
| -rw-r--r-- | fs/bcachefs/recovery.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/fs/bcachefs/bcachefs.h b/fs/bcachefs/bcachefs.h index ac797854e140..a186aa521049 100644 --- a/fs/bcachefs/bcachefs.h +++ b/fs/bcachefs/bcachefs.h @@ -283,9 +283,7 @@ do { \ "Force reads to use the reconstruct path, when reading" \ "from erasure coded extents") \ BCH_DEBUG_PARAM(test_restart_gc, \ - "Test restarting mark and sweep gc when bucket gens change")\ - BCH_DEBUG_PARAM(test_reconstruct_alloc, \ - "Test reconstructing the alloc btree") + "Test restarting mark and sweep gc when bucket gens change") #define BCH_DEBUG_PARAMS_ALL() BCH_DEBUG_PARAMS_ALWAYS() BCH_DEBUG_PARAMS_DEBUG() diff --git a/fs/bcachefs/opts.h b/fs/bcachefs/opts.h index c6ec9f7effe5..97a782f44f6e 100644 --- a/fs/bcachefs/opts.h +++ b/fs/bcachefs/opts.h @@ -258,6 +258,11 @@ enum opt_type { OPT_BOOL(), \ NO_SB_OPT, false, \ NULL, "Don\'t start filesystem, only open devices") \ + x(reconstruct_alloc, u8, \ + OPT_MOUNT, \ + OPT_BOOL(), \ + NO_SB_OPT, false, \ + NULL, "Reconstruct alloc btree") \ x(version_upgrade, u8, \ OPT_MOUNT, \ OPT_BOOL(), \ diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index 2aa63cc75f50..c9558ccb9a26 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -659,7 +659,7 @@ static int read_btree_roots(struct bch_fs *c) continue; if (i == BTREE_ID_ALLOC && - test_reconstruct_alloc(c)) { + c->opts.reconstruct_alloc) { c->sb.compat &= ~(1ULL << BCH_COMPAT_FEAT_ALLOC_INFO); continue; } |