svn commit: r193129 - in user/kmacy/releng_7_2_fcs/sys: cddl/contrib/opensolaris/uts/common/fs/zfs rpc

[Kip Macy]

Author: kmacy
Date: Sat May 30 22:25:49 2009
New Revision: 193129
URL: http://svn.freebsd.org/changeset/base/193129

Log:
  fix xdrmem_control and rpc dependency

Modified:
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/kmacy/releng_7_2_fcs/sys/rpc/xdr.h

Modified: user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Sat May 30 22:23:58 2009	(r193128)
+++ user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Sat May 30 22:25:49 2009	(r193129)
@@ -3122,3 +3122,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);

Modified: user/kmacy/releng_7_2_fcs/sys/rpc/xdr.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/rpc/xdr.h	Sat May 30 22:23:58 2009	(r193128)
+++ user/kmacy/releng_7_2_fcs/sys/rpc/xdr.h	Sat May 30 22:25:49 2009	(r193129)
@@ -216,8 +216,8 @@ xdr_putlong(XDR *xdrs, long *lp)
 		(*(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)
 
 /*