c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-24 03:08:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add support for libtirpc

Browse Source 
While OpenSolaris libc and glibc both include XDR support, the musl libc
does not in favor of depending on the BSD-licensed libtirpc library.

Adding support is a simple matter of detecting the library, including
the headers and linking against it.  By default libtirpc will be checked
for and if available used.  Otherwise, configure will fall back to using
the xdr implementation provided by libc if available.  The options
--with-tirpc/--without-tirpc can be used to disable this checking.

In addition, the xdr_control() function has been simplied to only
handle ZFSs specific use case.

Original-patch-by: stf <s@ctrlc.hu>
Original-patch-by: Richard Yao <ryao@gentoo.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Signed-off-by: Carlo Landmeter <clandmeter@gmail.com>
Closes #2254
Closes #4559
This commit is contained in:
Brian Behlendorf
2016-04-26 17:24:41 -07:00
parent 463a8cfe2b
commit 1ab3678b5d
9 changed files with 61 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libspl/include/rpc/xdr.h
+26 -17
View File
@@ -32,11 +32,20 @@
#ifndef LIBSPL_RPC_XDR_H
#define LIBSPL_RPC_XDR_H
#include_next <rpc/xdr.h>
/*
* These are XDR control operators
* When available prefer libtirpc for xdr functionality. This library is
* mandatory when compiling with musl libc because it does not provide xdr.
*/
#if defined(HAVE_LIBTIRPC)
#include <tirpc/rpc/xdr.h>
#ifdef xdr_control
#undef xdr_control
#endif
#else
#include_next <rpc/xdr.h>
#endif /* HAVE_LIBTIRPC */
#define XDR_GET_BYTES_AVAIL 1
@@ -46,20 +55,20 @@ typedef struct xdr_bytesrec {
} xdr_bytesrec_t;
/*
* These are the request arguments to XDR_CONTROL.
*
* XDR_PEEK - returns the contents of the next XDR unit on the XDR stream.
* XDR_SKIPBYTES - skips the next N bytes in the XDR stream.
* XDR_RDMAGET - for xdr implementation over RDMA, gets private flags from
* the XDR stream being moved over RDMA
* XDR_RDMANOCHUNK - for xdr implementaion over RDMA, sets private flags in
* the XDR stream moving over RDMA.
* This functionality is not required and is disabled in user space.
*/
#define XDR_PEEK 2
#define XDR_SKIPBYTES 3
#define XDR_RDMAGET 4
#define XDR_RDMASET 5
static inline bool_t
xdr_control(XDR *xdrs, int request, void *info)
{
xdr_bytesrec_t *xptr;
extern bool_t xdr_control(XDR *xdrs, int request, void *info);
ASSERT3U(request, ==, XDR_GET_BYTES_AVAIL);
#endif
xptr = (xdr_bytesrec_t *)info;
xptr->xc_is_last_record = TRUE;
xptr->xc_num_avail = xdrs->x_handy;
return (TRUE);
}
#endif /* LIBSPL_RPC_XDR_H */