From owner-p4-projects@FreeBSD.ORG  Fri Nov 14 14:53:29 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9F04B16A4D0; Fri, 14 Nov 2003 14:53:29 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 77A7416A4CE
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 14:53:29 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E9DE443FBF
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 14:53:28 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAEMrSXJ081705
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 14:53:28 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAEMrSho081702
	for perforce@freebsd.org; Fri, 14 Nov 2003 14:53:28 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Fri, 14 Nov 2003 14:53:28 -0800 (PST)
Message-Id: <200311142253.hAEMrSho081702@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42400 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Nov 2003 22:53:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=42400

Change 42400 by peter@peter_daintree on 2003/11/14 14:53:14

	avoid futzing around with alfred's changes for now.

Affected files ...

.. //depot/projects/hammer/sys/nfsclient/krpc_subr.c#6 edit

Differences ...

==== //depot/projects/hammer/sys/nfsclient/krpc_subr.c#6 (text+ko) ====

@@ -98,7 +98,7 @@
 	struct	auth_info rpc_verf;
 };
 
-struct rpc_reply {
+struct krpc_reply {
 	u_int32_t rp_xid;		/* request transaction id */
 	int32_t  rp_direction;		/* call direction (1) */
 	int32_t  rp_astatus;		/* accept status (0: accepted) */
@@ -195,7 +195,7 @@
 	struct sockaddr *from;
 	struct mbuf *m, *nam, *mhead;
 	struct rpc_call *call;
-	struct rpc_reply *reply;
+	struct krpc_reply *reply;
 	struct sockopt sopt;
 	struct timeval tv;
 	struct uio auio;
@@ -372,7 +372,7 @@
 				continue;
 			if (m->m_len < MIN_REPLY_HDR)
 				continue;
-			reply = mtod(m, struct rpc_reply *);
+			reply = mtod(m, struct krpc_reply *);
 
 			/* Is it the right reply? */
 			if (reply->rp_direction != txdr_unsigned(RPC_REPLY))
@@ -421,7 +421,7 @@
 			goto out;
 		}
 	}
-	reply = mtod(m, struct rpc_reply *);
+	reply = mtod(m, struct krpc_reply *);
 	if (reply->rp_auth.authtype != 0) {
 		len += fxdr_unsigned(u_int32_t, reply->rp_auth.authlen);
 		len = (len + 3) & ~3; /* XXX? */