get rid of m_release stuff

SCCS-vsn: sys/kern/uipc_syscalls.c 4.19
SCCS-vsn: sys/kern/uipc_mbuf.c 1.35

diff --git a/usr/src/sys/kern/uipc_mbuf.c b/usr/src/sys/kern/uipc_mbuf.c
index 68ccba8..cd93676 100644 (file)
--- a/usr/src/sys/kern/uipc_mbuf.c
+++ b/usr/src/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/*     uipc_mbuf.c     1.34    82/05/19        */
+/*     uipc_mbuf.c     1.35    82/06/14        */

 
 #include "../h/param.h"
 #include "../h/dir.h"
 
 #include "../h/param.h"
 #include "../h/dir.h"


@@ -15,8 +15,6 @@ mbinit()
 {
 
 COUNT(MBINIT);
 {
 
 COUNT(MBINIT);

-       if (m_reserve(32) == 0)
-               goto bad;

        if (m_clalloc(4, MPG_MBUFS) == 0)
                goto bad;
        if (m_clalloc(32, MPG_CLUSTERS) == 0)
        if (m_clalloc(4, MPG_MBUFS) == 0)
                goto bad;
        if (m_clalloc(32, MPG_CLUSTERS) == 0)


@@ -100,27 +98,6 @@ steal:
 
 /* NEED SOME WAY TO RELEASE SPACE */
 
 
 /* NEED SOME WAY TO RELEASE SPACE */
 

-/*
- * Space reservation routines
- */
-m_reserve(mbufs)
-       int mbufs;
-{
-
-       if (mbstat.m_mbcommitted + mbufs >
-             (nmbclusters * NMBPCL) * MBUFOVERALLOCFRACTION)
-               return (0);
-       mbstat.m_mbcommitted += mbufs;
-       return (1);
-}
-
-m_release(mbufs)
-       int mbufs;
-{
-
-       mbstat.m_mbcommitted -= mbufs;
-}
-

 /*
  * Space allocation routines.
  * These are also available as macros
 /*
  * Space allocation routines.
  * These are also available as macros

diff --git a/usr/src/sys/kern/uipc_syscalls.c b/usr/src/sys/kern/uipc_syscalls.c
index 29c2d1d..fbead41 100644 (file)
--- a/usr/src/sys/kern/uipc_syscalls.c
+++ b/usr/src/sys/kern/uipc_syscalls.c
@@ -1,4 +1,4 @@
-/*     uipc_syscalls.c 4.18    82/06/12        */
+/*     uipc_syscalls.c 4.19    82/06/14        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -62,7 +62,7 @@ COUNT(SPIPE);
        return;
 free4:
        wf->f_count = 0;
        return;
 free4:
        wf->f_count = 0;

-       u.u_ofile[u.u_r.r_val1] = 0;
+       u.u_ofile[u.u_r.r_val2] = 0;

 free3:
        rf->f_count = 0;
        u.u_ofile[r] = 0;
 free3:
        rf->f_count = 0;
        u.u_ofile[r] = 0;