symbolic links

[unix-history] / usr / src / sys / kern / kern_resource.c

diff --git a/usr/src/sys/kern/kern_resource.c b/usr/src/sys/kern/kern_resource.c
index f114605..e1d8d93 100644 (file)
--- a/usr/src/sys/kern/kern_resource.c
+++ b/usr/src/sys/kern/kern_resource.c
@@ -1,4 +1,4 @@
-/*     kern_resource.c 4.3     %G%     */
+/*     kern_resource.c 4.6     82/02/27        */

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


@@ -24,9 +24,9 @@ sysacct()
        uap = (struct a *)u.u_ap;
        if (suser()) {
                if (uap->fname==NULL) {
        uap = (struct a *)u.u_ap;
        if (suser()) {
                if (uap->fname==NULL) {

-                       if (acctp) {
-                               plock(acctp);
-                               iput(acctp);
+                       if (ip = acctp) {
+                               ilock(ip);
+                               iput(ip);

                                acctp = NULL;
                        }
                        return;
                                acctp = NULL;
                        }
                        return;


@@ -35,7 +35,7 @@ sysacct()
                        u.u_error = EBUSY;
                        return;
                }
                        u.u_error = EBUSY;
                        return;
                }

-               ip = namei(uchar, 0);
+               ip = namei(uchar, 0, 1);

                if(ip == NULL)
                        return;
                if((ip->i_mode & IFMT) != IFREG) {
                if(ip == NULL)
                        return;
                if((ip->i_mode & IFMT) != IFREG) {


@@ -44,7 +44,7 @@ sysacct()
                        return;
                }
                acctp = ip;
                        return;
                }
                acctp = ip;

-               prele(ip);
+               irele(ip);

        }
 }
 
        }
 }
 


@@ -61,7 +61,7 @@ acct()
 
        if ((ip=acctp)==NULL)
                return;
 
        if ((ip=acctp)==NULL)
                return;

-       plock(ip);
+       ilock(ip);

        for (i=0; i<sizeof(ap->ac_comm); i++)
                ap->ac_comm[i] = u.u_comm[i];
        ap->ac_utime = compress((long)u.u_vm.vm_utime);
        for (i=0; i<sizeof(ap->ac_comm); i++)
                ap->ac_comm[i] = u.u_comm[i];
        ap->ac_utime = compress((long)u.u_vm.vm_utime);


@@ -85,7 +85,7 @@ acct()
        writei(ip);
        if(u.u_error)
                ip->i_size = siz;
        writei(ip);
        if(u.u_error)
                ip->i_size = siz;

-       prele(ip);
+       irele(ip);

 }
 
 /*
 }
 
 /*


@@ -111,24 +111,3 @@ register long t;
        }
        return((exp<<13) + t);
 }
        }
        return((exp<<13) + t);
 }

-
-/*
- * lock user into core as much
- * as possible. swapping may still
- * occur if core grows.
- */
-syslock()
-{
-       register struct proc *p;
-       register struct a {
-               int     flag;
-       } *uap;
-
-       uap = (struct a *)u.u_ap;
-       if(suser()) {
-               p = u.u_procp;
-               p->p_flag &= ~SULOCK;
-               if(uap->flag)
-                       p->p_flag |= SULOCK;
-       }
-}