rust: remove dependency on itertools

[bcachefs-tools-debian] / cmd_migrate.c

diff --git a/cmd_migrate.c b/cmd_migrate.c
index 07fc145290034ae9eed9706d86caada62c116202..ea32e4ee497b7cf7ea178cced1c4ec65a0fedbe4 100644 (file)
--- a/cmd_migrate.c
+++ b/cmd_migrate.c
@@ -678,13 +678,13 @@ static int migrate_fs(const char          *fs_path,
        dev.path = dev_t_to_path(stat.st_dev);
        dev.bdev = blkdev_get_by_path(dev.path, BLK_OPEN_READ|BLK_OPEN_WRITE, &dev, NULL);
 
-       opt_set(fs_opts, block_size, get_blocksize(dev.bdev->bd_buffered_fd));
+       opt_set(fs_opts, block_size, get_blocksize(dev.bdev->bd_fd));
 
        char *file_path = mprintf("%s/bcachefs", fs_path);
        printf("Creating new filesystem on %s in space reserved at %s\n",
               dev.path, file_path);
 
-       dev.size        = get_size(dev.bdev->bd_buffered_fd);
+       dev.size        = get_size(dev.bdev->bd_fd);
        dev.bucket_size = bch2_pick_bucket_size(fs_opts, &dev);
        dev.nbuckets    = dev.size / dev.bucket_size;
 
@@ -693,13 +693,13 @@ static int migrate_fs(const char          *fs_path,
        u64 bcachefs_inum;
        ranges extents = reserve_new_fs_space(file_path,
                                fs_opts.block_size >> 9,
-                               get_size(dev.bdev->bd_buffered_fd) / 5,
+                               get_size(dev.bdev->bd_fd) / 5,
                                &bcachefs_inum, stat.st_dev, force);
 
        find_superblock_space(extents, format_opts, &dev);
 
        struct bch_sb *sb = bch2_format(fs_opt_strs,
-                                       fs_opts,format_opts, &dev, 1);
+                                       fs_opts, format_opts, &dev, 1);
        u64 sb_offset = le64_to_cpu(sb->layout.sb_offset[0]);
 
        if (format_opts.passphrase)
@@ -733,6 +733,7 @@ static int migrate_fs(const char            *fs_path,
        printf("Migrate complete, running fsck:\n");
        opt_set(opts, nostart,  false);
        opt_set(opts, nochanges, true);
+       opt_set(opts, read_only, true);
 
        c = bch2_fs_open(path, 1, opts);
        if (IS_ERR(c))