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 /include/sys | |
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 'include/sys')
-rw-r--r-- | include/sys/zstd/zstd.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/sys/zstd/zstd.h b/include/sys/zstd/zstd.h index db1f27716..f965df319 100644 --- a/include/sys/zstd/zstd.h +++ b/include/sys/zstd/zstd.h @@ -83,13 +83,13 @@ typedef struct zfs_zstd_header { int zstd_init(void); void zstd_fini(void); -size_t zstd_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, - int level); -int zstd_get_level(void *s_start, size_t s_len, uint8_t *level); -int zstd_decompress_level(void *s_start, void *d_start, size_t s_len, +size_t zfs_zstd_compress(void *s_start, void *d_start, size_t s_len, + size_t d_len, int level); +int zfs_zstd_get_level(void *s_start, size_t s_len, uint8_t *level); +int zfs_zstd_decompress_level(void *s_start, void *d_start, size_t s_len, size_t d_len, uint8_t *level); -int zstd_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, - int n); +int zfs_zstd_decompress(void *s_start, void *d_start, size_t s_len, + size_t d_len, int n); #ifdef __cplusplus } |