]> git.proxmox.com Git - mirror_zfs.git/commit
Linux 5.19 compat: zap_flags_t conflict
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 27 May 2022 22:56:05 +0000 (15:56 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 31 May 2022 19:04:39 +0000 (12:04 -0700)
commit91350681b8c8b3f0a9b04e6ab3b8931406e87355
tree9e799e75e53835b7d126dcae31274caeb81b7f23
parentd41e864181e4544eca08332b31f85318a3b0e3b3
Linux 5.19 compat: zap_flags_t conflict

As of the Linux 5.19 kernel an identically named zap_flags_t typedef
is declared in the include/linux/mm_types.h linux header.  Sadly,
the inclusion of this header cannot be easily avoided.  To resolve
the conflict a #define is used to remap the name in the OpenZFS
sources when building against the Linux kernel.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #13515
include/sys/zap.h