Date: Sat, 30 May 2009 22:25:49 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r193129 - in user/kmacy/releng_7_2_fcs/sys: cddl/contrib/opensolaris/uts/common/fs/zfs rpc Message-ID: <200905302225.n4UMPnRm021386@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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) /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905302225.n4UMPnRm021386>