From owner-svn-src-head@FreeBSD.ORG Sat May 30 22:23:59 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20B76106564A; Sat, 30 May 2009 22:23:59 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E848B8FC23; Sat, 30 May 2009 22:23:58 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4UMNwRa021310; Sat, 30 May 2009 22:23:58 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4UMNwUl021307; Sat, 30 May 2009 22:23:58 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200905302223.n4UMNwUl021307@svn.freebsd.org> From: Kip Macy Date: Sat, 30 May 2009 22:23:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193128 - in head/sys: cddl/contrib/opensolaris/uts/common/fs/zfs modules/zfs rpc X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 May 2009 22:23:59 -0000 Author: kmacy Date: Sat May 30 22:23:58 2009 New Revision: 193128 URL: http://svn.freebsd.org/changeset/base/193128 Log: fix xdrmem_control to be safe in an if statement fix zfs to depend on krpc remove xdr from zfs makefile Submitted by: dchagin@freebsd.org Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c head/sys/modules/zfs/Makefile head/sys/rpc/xdr.h Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Sat May 30 22:16:29 2009 (r193127) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Sat May 30 22:23:58 2009 (r193128) @@ -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); Modified: head/sys/modules/zfs/Makefile ============================================================================== --- head/sys/modules/zfs/Makefile Sat May 30 22:16:29 2009 (r193127) +++ head/sys/modules/zfs/Makefile Sat May 30 22:23:58 2009 (r193128) @@ -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 Modified: head/sys/rpc/xdr.h ============================================================================== --- head/sys/rpc/xdr.h Sat May 30 22:16:29 2009 (r193127) +++ head/sys/rpc/xdr.h Sat May 30 22:23:58 2009 (r193128) @@ -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) /*