From 99eae7b7b1d0dfe2463f468406efaea5f7258df8 Mon Sep 17 00:00:00 2001 From: dfr Date: Tue, 3 Jun 1997 17:22:47 +0000 Subject: Various fixes from NetBSD: Use u_int for rpc procedure numbers. Some fixes to NQNFS. A rare NULL pointer dereference. Ignore NFSMNT_NOCONN for TCP mounts. Obtained from: NetBSD --- sys/nfsserver/nfsrvstats.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/nfsserver/nfsrvstats.h') diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h index 2dc19c1..3521dae 100644 --- a/sys/nfsserver/nfsrvstats.h +++ b/sys/nfsserver/nfsrvstats.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.4 (Berkeley) 5/1/95 - * $Id: nfs.h,v 1.26 1997/05/13 17:25:44 dfr Exp $ + * $Id: nfs.h,v 1.27 1997/05/19 14:36:46 dfr Exp $ */ #ifndef _NFS_NFS_H_ @@ -333,7 +333,7 @@ struct nfsreq { int r_retry; /* max retransmission count */ int r_rexmit; /* current retrans count */ int r_timer; /* tick counter on reply */ - int r_procnum; /* NFS procedure number */ + u_int32_t r_procnum; /* NFS procedure number */ int r_rtt; /* RTT for rpc */ struct proc *r_procp; /* Proc that did I/O system call */ }; @@ -483,7 +483,7 @@ struct nfsrv_descript { struct mbuf *nd_nam; /* and socket addr */ struct mbuf *nd_nam2; /* return socket addr */ caddr_t nd_dpos; /* Current dissect pos */ - int nd_procnum; /* RPC # */ + u_int32_t nd_procnum; /* RPC # */ int nd_stable; /* storage type */ int nd_flag; /* nd_flag */ int nd_len; /* Length of this write */ -- cgit v1.1