BSD 4_3_Reno release

[unix-history] / usr / src / sys / nfs / nfs_syscalls.c

diff --git a/usr/src/sys/nfs/nfs_syscalls.c b/usr/src/sys/nfs/nfs_syscalls.c
index e9505d6..d78b006 100644 (file)
--- a/usr/src/sys/nfs/nfs_syscalls.c
+++ b/usr/src/sys/nfs/nfs_syscalls.c
@@ -5,9 +5,22 @@
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
  *
  * This code is derived from software contributed to Berkeley by
  * Rick Macklem at The University of Guelph.
  *

- * %sccs.include.redist.c%
+ * Redistribution is only permitted until one year after the first shipment
+ * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
+ * binary forms are permitted provided that: (1) source distributions retain
+ * this entire copyright notice and comment, and (2) distributions including
+ * binaries display the following acknowledgement:  This product includes
+ * software developed by the University of California, Berkeley and its
+ * contributors'' in the documentation or other materials provided with the
+ * distribution and in all advertising materials mentioning features or use
+ * of this software.  Neither the name of the University nor the names of
+ * its contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  *
  *

- *     @(#)nfs_syscalls.c      7.20 (Berkeley) %G%
+ *     @(#)nfs_syscalls.c      7.18 (Berkeley) 6/28/90

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -41,31 +54,10 @@ extern int nfs_asyncdaemons;
 extern struct proc *nfs_iodwant[NFS_MAXASYNCDAEMON];
 extern int nfs_tcpnodelay;
 struct file *getsock();
 extern struct proc *nfs_iodwant[NFS_MAXASYNCDAEMON];
 extern int nfs_tcpnodelay;
 struct file *getsock();

-struct mbuf *nfs_compress();

 
 #define        TRUE    1
 #define        FALSE   0
 
 
 #define        TRUE    1
 #define        FALSE   0
 

-static int compressreply[NFS_NPROCS] = {
-       FALSE,
-       TRUE,
-       TRUE,
-       FALSE,
-       TRUE,
-       TRUE,
-       FALSE,
-       FALSE,
-       TRUE,
-       TRUE,
-       TRUE,
-       TRUE,
-       TRUE,
-       TRUE,
-       TRUE,
-       TRUE,
-       TRUE,
-       TRUE,
-};

 /*
  * NFS server system calls
  * getfh() lives here too, but maybe should move to kern/vfs_syscalls.c
 /*
  * NFS server system calls
  * getfh() lives here too, but maybe should move to kern/vfs_syscalls.c


@@ -133,7 +125,7 @@ nfssvc(p, uap, retval)
        struct mbuf msk, mtch;
        struct socket *so;
        caddr_t dpos;
        struct mbuf msk, mtch;
        struct socket *so;
        caddr_t dpos;

-       int procid, repstat, error, cacherep, wascomp;
+       int procid, repstat, error, cacherep;

        u_long retxid;
 
        /*
        u_long retxid;
 
        /*


@@ -195,7 +187,7 @@ nfssvc(p, uap, retval)
        for (;;) {
                if (error = nfs_getreq(so, nfs_prog, nfs_vers, NFS_NPROCS-1,
                   &nam, &mrep, &md, &dpos, &retxid, &procid, cr,
        for (;;) {
                if (error = nfs_getreq(so, nfs_prog, nfs_vers, NFS_NPROCS-1,
                   &nam, &mrep, &md, &dpos, &retxid, &procid, cr,

-                  &msk, &mtch, &wascomp)) {
+                  &msk, &mtch)) {

                        if (nam)
                                m_freem(nam);
                        if (error == EPIPE || error == EINTR ||
                        if (nam)
                                m_freem(nam);
                        if (error == EPIPE || error == EINTR ||


@@ -241,10 +233,6 @@ nfssvc(p, uap, retval)
                        }
                        mreq->m_pkthdr.len = siz;
                        mreq->m_pkthdr.rcvif = (struct ifnet *)0;
                        }
                        mreq->m_pkthdr.len = siz;
                        mreq->m_pkthdr.rcvif = (struct ifnet *)0;

-                       if (wascomp && compressreply[procid]) {
-                               mreq = nfs_compress(mreq);
-                               siz = mreq->m_pkthdr.len;
-                       }

                        /*
                         * For non-atomic protocols, prepend a Sun RPC
                         * Record Mark.
                        /*
                         * For non-atomic protocols, prepend a Sun RPC
                         * Record Mark.