PERFORCE change 42400 for review

[Peter Wemm]

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

Change 42400 by peter at 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? */