diff options
| author |  Kent Overstreet <kent.overstreet@linux.dev>
| 2023-08-06 10:04:37 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev>
| 2023-10-22 17:10:09 -0400 |
| commit | e08e63e44e65761e6eb53fcd568d194f607daa61 (patch) | |
| tree | 9128db786cae25b4eddfaccff21a3625885ec946 /fs/bcachefs/recovery.c | |
| parent | bcachefs: kill EBUG_ON() redefinition in bkey.c (diff) | |
| download | linux-e08e63e44e65761e6eb53fcd568d194f607daa61.tar.gz linux-e08e63e44e65761e6eb53fcd568d194f607daa61.tar.bz2 linux-e08e63e44e65761e6eb53fcd568d194f607daa61.zip | |
bcachefs: BCH_COMPAT_bformat_overflow_done no longer required
Awhile back, we changed bkey_format generation to ensure that the packed
representation could never represent fields larger than the unpacked
representation.
This was to ensure that bkey_packed_successor() always gave a sensible
result, but in the current code bkey_packed_successor() is only used in
a debug assertion - not for anything important.
This kills the requirement that we've gotten rid of those weird bkey
formats, and instead changes the assertion to check if we're dealing
with an old weird bkey format.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/recovery.c')
| -rw-r--r-- | fs/bcachefs/recovery.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/bcachefs/recovery.c b/fs/bcachefs/recovery.c index edc9830d8163..35b67c544a6a 100644 --- a/fs/bcachefs/recovery.c +++ b/fs/bcachefs/recovery.c @@ -1322,12 +1322,6 @@ int bch2_fs_recovery(struct bch_fs *c) goto err; } - if (!(c->sb.compat & (1ULL << BCH_COMPAT_bformat_overflow_done))) { - bch_err(c, "filesystem may have incompatible bkey formats; run fsck from the compat branch to fix"); - ret = -EINVAL; - goto err; - } - if (c->opts.fsck || !(c->opts.nochanges && c->opts.norecovery)) check_version_upgrade(c); @@ -1527,7 +1521,6 @@ use_clean: mutex_unlock(&c->sb_lock); if (!(c->sb.compat & (1ULL << BCH_COMPAT_extents_above_btree_updates_done)) || - !(c->sb.compat & (1ULL << BCH_COMPAT_bformat_overflow_done)) || c->sb.version_min < bcachefs_metadata_version_btree_ptr_sectors_written) { struct bch_move_stats stats; |