alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-12-08 00:00:12 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

cmd_image: Make sure we don't lose filesystem errors

Browse Source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2025-11-27 13:30:46 -05:00
parent 7094e625c0
commit 8e7c675fe3
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
c_src/cmd_image.c
View File

@ -486,10 +486,15 @@ static void image_create(struct bch_opt_strs fs_opt_strs,
struct copy_fs_state s = { .verbosity = verbosity };
ret = copy_fs(c, &s, src_fd, src_path) ?:
finish_image(c, keep_alloc, verbosity);
bch_err_msg(c, ret, "syncing data");
if (ret)
goto err;
bch2_fs_exit(c);
ret = bch2_fs_exit(c);
if (ret) {
fprintf(stderr, "error shutting down new filesystem: %s\n", bch2_err_str(ret));
goto err;
}
darray_exit(&device_paths);
xclose(src_fd);
return;
@ -728,18 +733,14 @@ static int image_update(const char *src_path, const char *dst_image,
ret = copy_fs(c, &s, src_fd, src_path) ?:
finish_image(c, keep_alloc, verbosity);
if (ret)
goto err;
bch_err_msg(c, ret, "syncing data");
bch2_fs_exit(c);
unlink(dev_opts.path);
xclose(src_fd);
return 0;
err_stop:
bch2_fs_exit(c);
ret = bch2_fs_exit(c) ?: ret;
err:
unlink(dev_opts.path);
exit(EXIT_FAILURE);
xclose(src_fd);
return ret ? EXIT_FAILURE : EXIT_SUCCESS;
}
static void image_update_usage(void)