"update from Rick Macklem adding TCP support to NFS"

[unix-history] / usr / src / sys / nfs / nfsmount.h

diff --git a/usr/src/sys/nfs/nfsmount.h b/usr/src/sys/nfs/nfsmount.h
index 3a6c467..cc5433d 100644 (file)
--- a/usr/src/sys/nfs/nfsmount.h
+++ b/usr/src/sys/nfs/nfsmount.h
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)nfsmount.h  7.4 (Berkeley) %G%
+ *     @(#)nfsmount.h  7.5 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -29,37 +29,28 @@ struct      nfsmount {
        int     nm_flag;                /* Flags for soft/hard... */
        struct  mount *nm_mountp;       /* Vfs structure for this filesystem */
        nfsv2fh_t nm_fh;                /* File handle of root dir */
        int     nm_flag;                /* Flags for soft/hard... */
        struct  mount *nm_mountp;       /* Vfs structure for this filesystem */
        nfsv2fh_t nm_fh;                /* File handle of root dir */

-       struct  socket  *nm_so;         /* Rpc socket */
-       struct  nfshost *nm_hostinfo;   /* Host and congestion information */
+       struct  socket *nm_so;          /* Rpc socket */
+       int     nm_sotype;              /* Type of socket */
+       int     nm_soproto;             /* and protocol */
+       int     nm_soflags;             /* pr_flags for socket protocol */
+       struct  mbuf *nm_nam;           /* Addr of server */

        short   nm_retry;               /* Max retry count */
        short   nm_rexmit;              /* Rexmit on previous request */
        short   nm_rtt;                 /* Round trip timer ticks @ NFS_HZ */
        short   nm_rto;                 /* Current timeout */
        short   nm_srtt;                /* Smoothed round trip time */
        short   nm_rttvar;              /* RTT variance */
        short   nm_retry;               /* Max retry count */
        short   nm_rexmit;              /* Rexmit on previous request */
        short   nm_rtt;                 /* Round trip timer ticks @ NFS_HZ */
        short   nm_rto;                 /* Current timeout */
        short   nm_srtt;                /* Smoothed round trip time */
        short   nm_rttvar;              /* RTT variance */

+       short   nm_currto;              /* Current rto of any nfsmount */
+       short   nm_currexmit;           /* Max rexmit count of nfsmounts */
+       short   nm_sent;                /* Request send count */
+       short   nm_window;              /* Request send window (max) */
+       short   nm_winext;              /* Window incremental value */
+       short   nm_ssthresh;            /* Slowstart threshold */
+       short   nm_salen;               /* Actual length of nm_sockaddr */

        int     nm_rsize;               /* Max size of read rpc */
        int     nm_wsize;               /* Max size of write rpc */
 };
 
        int     nm_rsize;               /* Max size of read rpc */
        int     nm_wsize;               /* Max size of write rpc */
 };
 

-/*
- * Hostinfo/congestion structure.
- * One allocated per NFS server.
- * Holds host address, congestion limits, request count, etc.
- * Reference count is of nfsmounts which point to it.
- */
-struct nfshost {
-       struct  nfshost *nh_next, *nh_prev;
-       short   nh_refcnt;              /* Reference count */
-       short   nh_currto;              /* Current rto of any nfsmount */
-       short   nh_currexmit;           /* Max rexmit count of nfsmounts */
-       short   nh_sent;                /* Request send count */
-       short   nh_window;              /* Request send window (max) */
-       short   nh_winext;              /* Window incremental value */
-       short   nh_ssthresh;            /* Slowstart threshold */
-       short   nh_salen;               /* Actual length of nh_sockaddr */
-       struct  mbuf *nh_sockaddr;      /* Address of server */
-};
-

 #ifdef KERNEL
 /*
  * Convert mount ptr to nfsmount ptr.
 #ifdef KERNEL
 /*
  * Convert mount ptr to nfsmount ptr.