more lint

[unix-history] / usr / src / sys / ufs / ffs / ffs_vnops.c

diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index 1ad698c..e185d2a 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ffs_vnops.c
@@ -1,4 +1,4 @@
-/*     ffs_vnops.c     4.37    82/09/06        */
+/*     ffs_vnops.c     4.41    82/10/19        */

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


@@ -11,14 +11,11 @@
 #include "../h/fs.h"
 #include "../h/buf.h"
 #include "../h/proc.h"
 #include "../h/fs.h"
 #include "../h/buf.h"
 #include "../h/proc.h"

-#include "../h/inline.h"
-/* no reason to inline expand these guys here */
-#undef ilock
-#undef iunlock

 #include "../h/quota.h"
 #include "../h/descrip.h"
 #include "../h/uio.h"
 #include "../h/socket.h"
 #include "../h/quota.h"
 #include "../h/descrip.h"
 #include "../h/uio.h"
 #include "../h/socket.h"

+#include "../h/socketvar.h"

 
 chdir()
 {
 
 chdir()
 {


@@ -164,7 +161,7 @@ open1(ip, mode, checkpermissions)
        fp->f_type = DTYPE_FILE;
        i = u.u_r.r_val1;
        fp->f_inode = ip;
        fp->f_type = DTYPE_FILE;
        i = u.u_r.r_val1;
        fp->f_inode = ip;

-       openi(ip, mode);
+       u.u_error = openi(ip, mode);

        if (u.u_error == 0) {
                u.u_pofile[i] = flags;
                return;
        if (u.u_error == 0) {
                u.u_pofile[i] = flags;
                return;


@@ -237,7 +234,7 @@ link()
        }
        ip->i_nlink++;
        ip->i_flag |= ICHG;
        }
        ip->i_nlink++;
        ip->i_flag |= ICHG;

-       iupdat(ip, &time.tv_sec, &time.tv_sec, 1);
+       iupdat(ip, &time, &time, 1);

        iunlock(ip);
        u.u_dirp = (caddr_t)uap->linkname;
        xp = namei(uchar, 1, 0);
        iunlock(ip);
        u.u_dirp = (caddr_t)uap->linkname;
        xp = namei(uchar, 1, 0);


@@ -484,7 +481,7 @@ stat1(ip, ub)
 {
        struct stat ds;
 
 {
        struct stat ds;
 

-       IUPDAT(ip, &time.tv_sec, &time.tv_sec, 0);
+       IUPDAT(ip, &time, &time, 0);

        /*
         * Copy from inode table
         */
        /*
         * Copy from inode table
         */


@@ -716,6 +713,7 @@ outime()
        } *uap;
        register struct inode *ip;
        time_t tv[2];
        } *uap;
        register struct inode *ip;
        time_t tv[2];

+       struct timeval tv0, tv1;

 
        uap = (struct a *)u.u_ap;
        if ((ip = owner(1)) == NULL)
 
        uap = (struct a *)u.u_ap;
        if ((ip = owner(1)) == NULL)


@@ -724,7 +722,9 @@ outime()
                u.u_error = EFAULT;
        } else {
                ip->i_flag |= IACC|IUPD|ICHG;
                u.u_error = EFAULT;
        } else {
                ip->i_flag |= IACC|IUPD|ICHG;

-               iupdat(ip, &tv[0], &tv[1], 0);
+               tv0.tv_sec = tv[0]; tv0.tv_usec = 0;
+               tv1.tv_sec = tv[1]; tv1.tv_usec = 0;
+               iupdat(ip, &tv0, &tv1, 0);

        }
        iput(ip);
 }
        }
        iput(ip);
 }


@@ -732,7 +732,7 @@ outime()
 sync()
 {
 
 sync()
 {
 

-       update(0);
+       update();

 }
 
 flock()
 }
 
 flock()


@@ -869,7 +869,7 @@ maknode(mode)
        /*
         * Make sure inode goes to disk before directory entry.
         */
        /*
         * Make sure inode goes to disk before directory entry.
         */

-       iupdat(ip, &time.tv_sec, &time.tv_sec, 1);
+       iupdat(ip, &time, &time, 1);

        direnter(ip);
        if (u.u_error) {
                /*
        direnter(ip);
        if (u.u_error) {
                /*