upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 16:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix xdrmem_control to be safe in an if statement

Browse source 
fix zfs to depend on krpc
remove xdr from zfs makefile

Submitted by:	dchagin@freebsd.org
This commit is contained in:
Kip Macy 2009-05-30 22:23:58 +00:00
parent 461c78604e
commit 762169b50a
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
View file

@ -3121,3 +3121,4 @@ static moduledata_t zfs_mod = {
};
DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_VFS, SI_ORDER_ANY);
MODULE_DEPEND(zfsctrl, opensolaris, 1, 1, 1);
MODULE_DEPEND(zfsctrl, krpc, 1, 1, 1);

5
sys/modules/zfs/Makefile
View file

@ -44,11 +44,6 @@ SRCS+= list.c
SRCS+= nvpair_alloc_system.c
SRCS+= taskq.c
#.PATH: ${SUNW}/uts/common/rpc
#SRCS+= opensolaris_xdr.c
#SRCS+= opensolaris_xdr_array.c
#SRCS+= opensolaris_xdr_mem.c
.PATH: ${SUNW}/uts/common/zmod
SRCS+= adler32.c
SRCS+= opensolaris_crc32.c

4
sys/rpc/xdr.h
View file

@ -216,8 +216,8 @@ xdr_putint32(XDR *xdrs, int32_t *ip)
(*(xdrs)->x_ops->x_destroy)(xdrs)
#define XDR_CONTROL(xdrs, req, op) \
if ((xdrs)->x_ops->x_control) \
(*(xdrs)->x_ops->x_control)(xdrs, req, op)
(((xdrs)->x_ops->x_control == NULL) ? (FALSE) : \
(*(xdrs)->x_ops->x_control)(xdrs, req, op))
#define xdr_control(xdrs, req, op) XDR_CONTROL(xdrs, req, op)
/*