proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-16 04:04:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1824 from brauner/2017-09-20/fix_best_option

Browse Source 
zfs: return error directly when zfs creation fails
This commit is contained in:
Stéphane Graber 2017-09-20 11:42:33 -04:00 committed by GitHub
commit 5355740f3c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lxc/storage/zfs.c
View File

@ -754,12 +754,14 @@ int zfs_create(struct lxc_storage *bdev, const char *dest, const char *n,
cmd_args.argv = argv;
ret = run_command(cmd_output, sizeof(cmd_output),
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);
else if (cmd_output[0] != '\0')
return -1;
} else if (cmd_output[0] != '\0') {
INFO("Created zfs dataset \"%s\": %s", bdev->src, cmd_output);
else
} else {
TRACE("Created zfs dataset \"%s\"", bdev->src);
}
ret = mkdir_p(bdev->dest, 0755);
if (ret < 0 && errno != EEXIST) {