nix: replace deprecated cargo/rustc aliases with new version

[bcachefs-tools-debian] / libbcachefs.c

diff --git a/libbcachefs.c b/libbcachefs.c
index 8ba01947fa7e2842352dd6adab2afea8f35dec19..092a54a67ef8ffb82b0807560f8e39dedc0017af 100644 (file)
--- 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);
@@ -689,7 +690,7 @@ dev_names bchu_fs_get_devices(struct bchfs_handle fs)
        struct dirent *d;
        dev_names devs;
 
-       darray_init(devs);
+       darray_init(&devs);
 
        while ((errno = 0), (d = readdir(dir))) {
                struct dev_name n = { 0, NULL, NULL };
@@ -713,7 +714,7 @@ dev_names bchu_fs_get_devices(struct bchfs_handle fs)
                n.label = read_file_str(fs.sysfs_fd, label_attr);
                free(label_attr);
 
-               darray_push(devs, n);
+               darray_push(&devs, n);
        }
 
        closedir(dir);