diff options
| author | Sebastian Gottschall <[email protected]> | 2020-08-24 21:20:41 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-24 12:20:41 -0700 |
| commit | 184df27eef0abdc7ab2105b21257f753834b936b (patch) | |
| tree | 32557e08b1fc7ec169ab02c0cc3ed69ee8e7de7e /module/zfs | |
| parent | 04c37b6851fcfde84ec3be4ff63f5ee9022bf830 (diff) | |
Avoid symbol collision with in-kernel zstdlib
For Linux, when zfs is compiled as an in kernel static variant
and the in kernel zstd library is compiled statically into the kernel
a symbol collision will occur. This wrapper header renames all
of the relevant zstd functions to avoid this problem.
Reviewed-by: Kjeld Schouten <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Sebastian Gottschall <[email protected]>
Closes #10775
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/zio_compress.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/zio_compress.c b/module/zfs/zio_compress.c index d91e82d9e..2db3cec35 100644 --- a/module/zfs/zio_compress.c +++ b/module/zfs/zio_compress.c @@ -66,8 +66,8 @@ zio_compress_info_t zio_compress_table[ZIO_COMPRESS_FUNCTIONS] = { {"gzip-9", 9, gzip_compress, gzip_decompress, NULL}, {"zle", 64, zle_compress, zle_decompress, NULL}, {"lz4", 0, lz4_compress_zfs, lz4_decompress_zfs, NULL}, - {"zstd", ZIO_ZSTD_LEVEL_DEFAULT, zstd_compress, zstd_decompress, - zstd_decompress_level}, + {"zstd", ZIO_ZSTD_LEVEL_DEFAULT, zfs_zstd_compress, + zfs_zstd_decompress, zfs_zstd_decompress_level}, }; uint8_t |