diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-12-02 19:46:49 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-03-13 11:34:43 -0400 |
| commit | 1b40bcdaf9a907b9e5275a5bbc1009f16bfc5da0 (patch) | |
| tree | 90b4a829a30f241948baeb0c7044972cdcdc4e40 | |
| parent | e1eac63d3c3a64247dd04bb90a1b1e2f6bcddd97 (diff) | |
bcachefs: New magic number
Add a new bcachefs-specific magic number for the superblock, instead of
continuing to use the old bcache magic number3
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/bcachefs_format.h | 2 | ||||
| -rw-r--r-- | fs/bcachefs/super-io.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/fs/bcachefs/bcachefs_format.h b/fs/bcachefs/bcachefs_format.h index 04ac93a3a5a3..936782b11671 100644 --- a/fs/bcachefs/bcachefs_format.h +++ b/fs/bcachefs/bcachefs_format.h @@ -1510,7 +1510,7 @@ struct bch_sb_layout { * @version_min - Oldest metadata version this filesystem contains; so we can * safely drop compatibility code and refuse to mount filesystems * we'd need it for - * @magic - identifies as a bcachefs superblock (BCACHE_MAGIC) + * @magic - identifies as a bcachefs superblock (BCHFS_MAGIC) * @seq - incremented each time superblock is written * @uuid - used for generating various magic numbers and identifying * member devices, never changes diff --git a/fs/bcachefs/super-io.c b/fs/bcachefs/super-io.c index f07a59bfaa9d..7975b664a7fc 100644 --- a/fs/bcachefs/super-io.c +++ b/fs/bcachefs/super-io.c @@ -803,6 +803,11 @@ int bch2_write_super(struct bch_fs *c) closure_init_stack(cl); memset(&sb_written, 0, sizeof(sb_written)); + if (c->opts.version_upgrade) { + c->disk_sb.sb->magic = BCHFS_MAGIC; + c->disk_sb.sb->layout.magic = BCHFS_MAGIC; + } + le64_add_cpu(&c->disk_sb.sb->seq, 1); if (test_bit(BCH_FS_ERROR, &c->flags)) |