From 50fb4c3ed5fbfbf340e29fef62786b46df4b1acf Mon Sep 17 00:00:00 2001 From: Allan Jude Date: Thu, 13 Aug 2020 17:21:59 +0000 Subject: [PATCH] Cleanup Signed-off-by: Allan Jude --- include/sys/zio_compress.h | 10 ---------- module/zfs/zio.c | 2 -- .../tests/functional/cli_root/zpool_get/zpool_get.cfg | 1 - 3 files changed, 13 deletions(-) diff --git a/include/sys/zio_compress.h b/include/sys/zio_compress.h index c16bb6af86f3..0b8f9cca9d78 100644 --- a/include/sys/zio_compress.h +++ b/include/sys/zio_compress.h @@ -179,16 +179,6 @@ extern size_t lz4_compress_zfs(void *src, void *dst, size_t s_len, size_t d_len, extern int lz4_decompress_zfs(void *src, void *dst, size_t s_len, size_t d_len, int level); -extern void zstd_init(void); -extern void zstd_fini(void); -extern size_t zstd_compress(void *src, void *dst, size_t s_len, size_t d_len, - int level); -extern int zstd_decompress(void *src, void *dst, size_t s_len, size_t d_len, - int level); -extern int zstd_decompress_level(void *src, void *dst, size_t s_len, - size_t d_len, uint8_t *level); -extern int zstd_get_level(void *src, size_t s_len, uint8_t *level); - /* * Compress and decompress data if necessary. */ diff --git a/module/zfs/zio.c b/module/zfs/zio.c index b49de8c514b5..ce139b78d5cd 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -231,7 +231,6 @@ zio_init(void) zio_inject_init(); lz4_init(); - zstd_init(); } void @@ -276,7 +275,6 @@ zio_fini(void) zio_inject_fini(); lz4_fini(); - zstd_fini(); } /* diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg b/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg index e7683e6293cf..8abef65de19f 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg @@ -80,7 +80,6 @@ typeset -a properties=( "feature@bookmark_written" "feature@log_spacemap" "feature@device_rebuild" - "feature@zstd_compress" ) if is_linux || is_freebsd; then