From owner-svn-src-all@freebsd.org  Thu Mar  3 14:44:32 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4AF3CA93093;
 Thu,  3 Mar 2016 14:44:32 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 191B0D12;
 Thu,  3 Mar 2016 14:44:32 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u23EiVdv076304;
 Thu, 3 Mar 2016 14:44:31 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u23EiVcd076303;
 Thu, 3 Mar 2016 14:44:31 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201603031444.u23EiVcd076303@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Thu, 3 Mar 2016 14:44:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296349 - head/include/rpc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Mar 2016 14:44:32 -0000

Author: pfg
Date: Thu Mar  3 14:44:30 2016
New Revision: 296349
URL: https://svnweb.freebsd.org/changeset/base/296349

Log:
  Add sunrpc compat define for xp_sock.
  
  SunRPC is using xp_sock in SVCXPRT, while TI-RPC is using
  xp_fd. Add a compatibility define.
  
  Illumos has something similar for the non-kernel case.
  
  Obtained from: linux-nfs project (git 0d94036c3a0d4c24d22bf6a8c40ac6625d972c29)

Modified:
  head/include/rpc/svc.h

Modified: head/include/rpc/svc.h
==============================================================================
--- head/include/rpc/svc.h	Thu Mar  3 13:07:59 2016	(r296348)
+++ head/include/rpc/svc.h	Thu Mar  3 14:44:30 2016	(r296349)
@@ -89,6 +89,7 @@ enum xprt_stat {
  */
 typedef struct __rpc_svcxprt {
 	int		xp_fd;
+#define	xp_sock		xp_fd
 	u_short		xp_port;	 /* associated port number */
 	const struct xp_ops {
 	    /* receive incoming requests */