From owner-svn-src-user@FreeBSD.ORG  Sat May 30 22:25:50 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2483D106566B;
	Sat, 30 May 2009 22:25:50 +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 1282B8FC26;
	Sat, 30 May 2009 22:25:50 +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 n4UMPnlF021388;
	Sat, 30 May 2009 22:25:49 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4UMPnRm021386;
	Sat, 30 May 2009 22:25:49 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200905302225.n4UMPnRm021386@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sat, 30 May 2009 22:25:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193129 - in user/kmacy/releng_7_2_fcs/sys:
	cddl/contrib/opensolaris/uts/common/fs/zfs rpc
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 May 2009 22:25:50 -0000

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)
 
 /*