]> git.proxmox.com Git - mirror_zfs.git/commit
Linux 5.16: Resolve ZSTD_isError symbol collision in Linux kernel
authorColeman Kane <ckane@colemankane.org>
Sun, 5 Dec 2021 20:18:46 +0000 (15:18 -0500)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 7 Dec 2021 20:28:22 +0000 (12:28 -0800)
commita78f19d3ec8e5c0f82c860870f1ddc442ca45e25
tree626336f5cc42f7c63f1acf943a7f8e1f59727729
parent1e767532f20030385897fea2cf84fb59b69bd13c
Linux 5.16: Resolve ZSTD_isError symbol collision in Linux kernel

Newer zstd code introduced in the main kernel tree now creates a symbol
collision with ZSTD_isError in our ZSTD code. This change relabels our
implementation with a ZFS-specific symbol name, and undoes some
macro-based micro-optimizations that conflict with the attempt to rename
our internal-use version.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Coleman Kane <ckane@colemankane.org>
Closes #12819
module/zstd/include/zstd_compat_wrapper.h
module/zstd/lib/zstd.c