From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 20 Sep 2017 08:13:30 +0000 (+0200)
Subject: zfs: return error directly when zfs creation fails
X-Git-Tag: lxc-3.0.0.beta1~235^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1824%2Fhead;p=thirdparty%2Flxc.git

zfs: return error directly when zfs creation fails

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/storage/zfs.c b/src/lxc/storage/zfs.c
index 1198fd52b..be90e5a11 100644
--- a/src/lxc/storage/zfs.c
+++ b/src/lxc/storage/zfs.c
@@ -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) {