From b02c3e9682fe024f4e2dea2710c772a60fa39c40 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 6 Jul 2025 13:20:27 -0400 Subject: posix_to_bcachefs: cleanup Signed-off-by: Kent Overstreet --- c_src/cmd_migrate.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'c_src/cmd_migrate.c') diff --git a/c_src/cmd_migrate.c b/c_src/cmd_migrate.c index b4da4e5b..1b08577f 100644 --- a/c_src/cmd_migrate.c +++ b/c_src/cmd_migrate.c @@ -279,17 +279,19 @@ static int migrate_fs(const char *fs_path, .dev = stat.st_dev, .extents = extents, .type = BCH_MIGRATE_migrate, + .reserve_start = roundup((format_opts.superblock_size * 2 + 8) << 9, + bucket_bytes(c->devs[0])), }; + BUG_ON(!s.reserve_start); - u64 reserve_start = roundup((format_opts.superblock_size * 2 + 8) << 9, - bucket_bytes(c->devs[0])); - BUG_ON(!reserve_start); - - copy_fs(c, fs_fd, fs_path, &s, reserve_start); + ret = copy_fs(c, &s, fs_fd, fs_path); bch2_fs_stop(c); + if (ret) + return ret; + printf("Migrate complete, running fsck:\n"); opt_set(opts, nostart, false); opt_set(opts, nochanges, true); -- cgit v1.2.3