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.c | |
| parent | f82cd58008706da43dd652dd9191511f2786d15d (diff) | |
Update bcachefs sources to be2d60d948 bcachefs: New magic number
Diffstat (limited to 'libbcachefs.c')
| -rw-r--r-- | libbcachefs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libbcachefs.c b/libbcachefs.c index 4fe2c3db..092a54a6 100644 --- a/libbcachefs.c +++ b/libbcachefs.c @@ -39,7 +39,7 @@ static void init_layout(struct bch_sb_layout *l, memset(l, 0, sizeof(*l)); - l->magic = BCACHE_MAGIC; + l->magic = BCHFS_MAGIC; l->layout_type = 0; l->nr_superblocks = 2; l->sb_max_size_bits = ilog2(sb_size); @@ -188,7 +188,7 @@ struct bch_sb *bch2_format(struct bch_opt_strs fs_opt_strs, sb.sb->version = le16_to_cpu(opts.version); sb.sb->version_min = le16_to_cpu(opts.version); - sb.sb->magic = BCACHE_MAGIC; + sb.sb->magic = BCHFS_MAGIC; sb.sb->user_uuid = opts.uuid; sb.sb->nr_devices = nr_devs; @@ -353,7 +353,8 @@ struct bch_sb *__bch2_super_read(int fd, u64 sector) xpread(fd, &sb, sizeof(sb), sector << 9); - if (memcmp(&sb.magic, &BCACHE_MAGIC, sizeof(sb.magic))) + if (memcmp(&sb.magic, &BCACHE_MAGIC, sizeof(sb.magic)) && + memcmp(&sb.magic, &BCHFS_MAGIC, sizeof(sb.magic))) die("not a bcachefs superblock"); size_t bytes = vstruct_bytes(&sb); |