]> git.proxmox.com Git - mirror_zfs.git/commit
xdr: header cleanup
authorRob N <robn@despairlabs.com>
Wed, 3 Apr 2024 22:13:27 +0000 (09:13 +1100)
committerGitHub <noreply@github.com>
Wed, 3 Apr 2024 22:13:27 +0000 (15:13 -0700)
commita9a4290173dfdfd25aabd623bc3ccd994126794a
tree2c2e14962b1e77479406bc7438324c26bfc1db2f
parentb12738182cff269456e7737241415356c08b5d2e
xdr: header cleanup

#16047 notes that include/os/freebsd/spl/rpc/xdr.h carried an
(apparently) incompatible license. While looking into it, it seems that
this file is actually unnecessary these days - FreeBSD's kernel XDR has
XDR_CONTROL, xdrmem_control and XDR_GET_BYTES_AVAIL, while userspace has
XDR_CONTROL and xdrmem_control, and our implementation of
XDR_GET_BYTES_AVAIL for libspl works nicely with it. So this removes
that file outright.

To keep the includes in nvpair.c tidy, I've made a few small adjustments
to the Linux headers. By definition, rpc/types.h provides bool_t and is
included before rpc/xdr.h, so I've created rpc/types.h for Linux. This
isn't necessary for userspace; both FreeBSD native and tirpc on Linux
already have these headers set up correctly.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Sponsored-by: https://despairlabs.com/sponsor/
Closes #16047
Closes #16051
include/os/freebsd/Makefile.am
include/os/freebsd/spl/rpc/xdr.h [deleted file]
include/os/linux/Makefile.am
include/os/linux/spl/rpc/types.h [new file with mode: 0644]
include/os/linux/spl/rpc/xdr.h
module/nvpair/nvpair.c
module/os/linux/spl/spl-xdr.c