Skip to content

L
lxc
Unverified Commit c37f111f by Christian Brauner Committed by Stéphane Graber
Options

zfs: return error directly when zfs creation fails

Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 311f4642
Showing with 5 additions and 3 deletions
src/lxc/storage/zfs.c
...@@ -754,12 +754,14 @@ int zfs_create(struct lxc_storage *bdev, const char *dest, const char *n, ...@@ -754,12 +754,14 @@ int zfs_create(struct lxc_storage *bdev, const char *dest, const char *n,
cmd_args.argv = argv; cmd_args.argv = argv;
ret = run_command(cmd_output, sizeof(cmd_output), ret = run_command(cmd_output, sizeof(cmd_output),
zfs_create_exec_wrapper, (void *)&cmd_args); zfs_create_exec_wrapper, (void *)&cmd_args);
if (ret < 0) if (ret < 0) {
ERROR("Failed to create zfs dataset \"%s\": %s", bdev->src, cmd_output); ERROR("Failed to create zfs dataset \"%s\": %s", bdev->src, cmd_output);
else if (cmd_output[0] != '\0') return -1;
} else if (cmd_output[0] != '\0') {
INFO("Created zfs dataset \"%s\": %s", bdev->src, cmd_output); INFO("Created zfs dataset \"%s\": %s", bdev->src, cmd_output);
else } else {
TRACE("Created zfs dataset \"%s\"", bdev->src); TRACE("Created zfs dataset \"%s\"", bdev->src);
}
ret = mkdir_p(bdev->dest, 0755); ret = mkdir_p(bdev->dest, 0755);
if (ret < 0 && errno != EEXIST) { if (ret < 0 && errno != EEXIST) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment