diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-06-27 22:09:35 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:10:06 -0400 |
| commit | ba8eeae8eee0aae03eb6be0372519b72057d312c (patch) | |
| tree | cf0e95c6cdb1b8352d81fae07928df901e628334 /fs/bcachefs/journal_io.c | |
| parent | 30a8278a1e2f627b1f28ab521e40eecacb223efc (diff) | |
bcachefs: bcachefs_metadata_version_major_minor
This introduces major/minor versioning to the superblock version number.
Major version number changes indicate incompatible releases; we can move
forward to a new major version number, but not backwards. Minor version
numbers indicate compatible changes - these add features, but can still
be mounted and used by old versions.
With the recent patches that make it possible to roll out new btrees and
key types without breaking compatibility, we should be able to roll out
most new features without incompatible changes.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/journal_io.c')
| -rw-r--r-- | fs/bcachefs/journal_io.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c index c7c2ae326ff7..f861ae2f176a 100644 --- a/fs/bcachefs/journal_io.c +++ b/fs/bcachefs/journal_io.c @@ -747,9 +747,11 @@ static int jset_validate(struct bch_fs *c, version = le32_to_cpu(jset->version); if (journal_entry_err_on(!bch2_version_compatible(version), c, jset, NULL, - "%s sector %llu seq %llu: incompatible journal entry version %u", + "%s sector %llu seq %llu: incompatible journal entry version %u.%u", ca ? ca->name : c->name, - sector, le64_to_cpu(jset->seq), version)) { + sector, le64_to_cpu(jset->seq), + BCH_VERSION_MAJOR(version), + BCH_VERSION_MINOR(version))) { /* don't try to continue: */ return -EINVAL; } @@ -794,9 +796,11 @@ static int jset_validate_early(struct bch_fs *c, version = le32_to_cpu(jset->version); if (journal_entry_err_on(!bch2_version_compatible(version), c, jset, NULL, - "%s sector %llu seq %llu: unknown journal entry version %u", + "%s sector %llu seq %llu: unknown journal entry version %u.%u", ca ? ca->name : c->name, - sector, le64_to_cpu(jset->seq), version)) { + sector, le64_to_cpu(jset->seq), + BCH_VERSION_MAJOR(version), + BCH_VERSION_MINOR(version))) { /* don't try to continue: */ return -EINVAL; } |