diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-12-02 19:47:25 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-12-02 19:48:23 -0500 |
| commit | 3867739e566d7f0df17ebed5e26c84ce88a90d40 (patch) | |
| tree | 0ea04c76128c47edd7211f2f4818d8398fd4b288 /libbcachefs/super-io.c | |
| parent | f82cd58008706da43dd652dd9191511f2786d15d (diff) | |
Update bcachefs sources to be2d60d948 bcachefs: New magic number
Diffstat (limited to 'libbcachefs/super-io.c')
| -rw-r--r-- | libbcachefs/super-io.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libbcachefs/super-io.c b/libbcachefs/super-io.c index 6d99a581..0aa243f5 100644 --- a/libbcachefs/super-io.c +++ b/libbcachefs/super-io.c @@ -211,7 +211,8 @@ static int validate_sb_layout(struct bch_sb_layout *layout, struct printbuf *out u64 offset, prev_offset, max_sectors; unsigned i; - if (uuid_le_cmp(layout->magic, BCACHE_MAGIC)) { + if (uuid_le_cmp(layout->magic, BCACHE_MAGIC) && + uuid_le_cmp(layout->magic, BCHFS_MAGIC)) { prt_printf(out, "Not a bcachefs superblock layout"); return -BCH_ERR_invalid_sb_layout; } @@ -538,7 +539,8 @@ reread: return ret; } - if (uuid_le_cmp(sb->sb->magic, BCACHE_MAGIC)) { + if (uuid_le_cmp(sb->sb->magic, BCACHE_MAGIC) && + uuid_le_cmp(sb->sb->magic, BCHFS_MAGIC)) { prt_printf(err, "Not a bcachefs superblock"); return -BCH_ERR_invalid_sb_magic; } |