diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2025-06-13 23:42:59 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2025-06-13 23:42:59 -0400 |
| commit | 5b9b063bb71cb1d4dfe124ca886681682a7ba416 (patch) | |
| tree | b9fdd1edbadbb2ac6102d92303671cc9d6b0968b /libbcachefs/btree_io.c | |
| parent | 792222046d80bd8715a3ed59faf9e5d5bda58417 (diff) | |
Update bcachefs sources to 54de30ef9de8 bcachefs: Kill unused tracepoints
Diffstat (limited to 'libbcachefs/btree_io.c')
| -rw-r--r-- | libbcachefs/btree_io.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libbcachefs/btree_io.c b/libbcachefs/btree_io.c index 6787d5b9..d8f3c4c6 100644 --- a/libbcachefs/btree_io.c +++ b/libbcachefs/btree_io.c @@ -741,16 +741,22 @@ static int validate_bset(struct bch_fs *c, struct bch_dev *ca, BCH_VERSION_MAJOR(version), BCH_VERSION_MINOR(version)); - if (btree_err_on(version < c->sb.version_min, + if (c->recovery.curr_pass != BCH_RECOVERY_PASS_scan_for_btree_nodes && + btree_err_on(version < c->sb.version_min, -BCH_ERR_btree_node_read_err_fixable, c, NULL, b, i, NULL, btree_node_bset_older_than_sb_min, "bset version %u older than superblock version_min %u", version, c->sb.version_min)) { - mutex_lock(&c->sb_lock); - c->disk_sb.sb->version_min = cpu_to_le16(version); - bch2_write_super(c); - mutex_unlock(&c->sb_lock); + if (bch2_version_compatible(version)) { + mutex_lock(&c->sb_lock); + c->disk_sb.sb->version_min = cpu_to_le16(version); + bch2_write_super(c); + mutex_unlock(&c->sb_lock); + } else { + /* We have no idea what's going on: */ + i->version = cpu_to_le16(c->sb.version); + } } if (btree_err_on(BCH_VERSION_MAJOR(version) > |