1 files changed, 39 insertions, 5 deletions

diff --git a/usr.sbin/makefs/zfs/dsl.c b/usr.sbin/makefs/zfs/dsl.c
index f7264b9d2ca7..8a8cee7c82b2 100644
--- a/usr.sbin/makefs/zfs/dsl.c
+++ b/usr.sbin/makefs/zfs/dsl.c
@@ -193,6 +193,39 @@ dsl_dir_set_prop(zfs_opt_t *zfs, zfs_dsl_dir_t *dir, const char *key,
 			nvlist_add_uint64(nvl, key, 0);
 		else
 			errx(1, "invalid value `%s' for %s", val, key);
+	} else if (strcmp(key, "compression") == 0) {
+		size_t i;
+
+		const struct zfs_compression_algorithm {
+			const char *name;
+			enum zio_compress alg;
+		} compression_algorithms[] = {
+			{ "off", ZIO_COMPRESS_OFF },
+			{ "on", ZIO_COMPRESS_ON },
+			{ "lzjb", ZIO_COMPRESS_LZJB },
+			{ "gzip", ZIO_COMPRESS_GZIP_6 },
+			{ "gzip-1", ZIO_COMPRESS_GZIP_1 },
+			{ "gzip-2", ZIO_COMPRESS_GZIP_2 },
+			{ "gzip-3", ZIO_COMPRESS_GZIP_3 },
+			{ "gzip-4", ZIO_COMPRESS_GZIP_4 },
+			{ "gzip-5", ZIO_COMPRESS_GZIP_5 },
+			{ "gzip-6", ZIO_COMPRESS_GZIP_6 },
+			{ "gzip-7", ZIO_COMPRESS_GZIP_7 },
+			{ "gzip-8", ZIO_COMPRESS_GZIP_8 },
+			{ "gzip-9", ZIO_COMPRESS_GZIP_9 },
+			{ "zle", ZIO_COMPRESS_ZLE },
+			{ "lz4", ZIO_COMPRESS_LZ4 },
+			{ "zstd", ZIO_COMPRESS_ZSTD },
+		};
+		for (i = 0; i < nitems(compression_algorithms); i++) {
+			if (strcmp(val, compression_algorithms[i].name) == 0) {
+				nvlist_add_uint64(nvl, key,
+				    compression_algorithms[i].alg);
+				break;
+			}
+		}
+		if (i == nitems(compression_algorithms))
+			errx(1, "invalid compression algorithm `%s'", val);
 	} else {
 		errx(1, "unknown property `%s'", key);
 	}
@@ -236,9 +269,6 @@ dsl_init(zfs_opt_t *zfs)
 
 	zfs->rootdsldir = dsl_dir_alloc(zfs, NULL);
 
-	nvlist_add_uint64(zfs->rootdsldir->propsnv, "compression",
-	    ZIO_COMPRESS_OFF);
-
 	zfs->rootds = dsl_dataset_alloc(zfs, zfs->rootdsldir);
 	zfs->rootdsldir->headds = zfs->rootds;
 
@@ -288,9 +318,13 @@ dsl_init(zfs_opt_t *zfs)
 	}
 
 	/*
-	 * Set the root dataset's mount point if the user didn't override the
-	 * default.
+	 * Set the root dataset's mount point and compression strategy if the
+	 * user didn't override the defaults.
 	 */
+	if (nvpair_find(zfs->rootdsldir->propsnv, "compression") == NULL) {
+		nvlist_add_uint64(zfs->rootdsldir->propsnv, "compression",
+		    ZIO_COMPRESS_OFF);
+	}
 	if (nvpair_find(zfs->rootdsldir->propsnv, "mountpoint") == NULL) {
 		nvlist_add_string(zfs->rootdsldir->propsnv, "mountpoint",
 		    zfs->rootpath);