more lint

SCCS-vsn: sys/kern/kern_resource.c 4.17
SCCS-vsn: sys/kern/sys_generic.c 5.19
SCCS-vsn: sys/ufs/ffs/ffs_alloc.c 2.17
SCCS-vsn: sys/ufs/lfs/lfs_alloc.c 2.17
SCCS-vsn: sys/ufs/ffs/ffs_inode.c 4.29
SCCS-vsn: sys/ufs/ffs/ufs_inode.c 4.29
SCCS-vsn: sys/ufs/lfs/lfs_inode.c 4.29
SCCS-vsn: sys/ufs/ufs/ufs_inode.c 4.29
SCCS-vsn: sys/kern/vfs_lookup.c 4.28
SCCS-vsn: sys/ufs/ffs/ufs_lookup.c 4.28
SCCS-vsn: sys/ufs/ufs/ufs_lookup.c 4.28
SCCS-vsn: sys/kern/vfs_syscalls.c 4.41
SCCS-vsn: sys/ufs/ffs/ffs_vnops.c 4.41
SCCS-vsn: sys/ufs/ffs/ufs_vnops.c 4.41
SCCS-vsn: sys/ufs/lfs/lfs_vnops.c 4.41
SCCS-vsn: sys/ufs/ufs/ufs_vnops.c 4.41

diff --git a/usr/src/sys/kern/kern_resource.c b/usr/src/sys/kern/kern_resource.c
index eb5af6c..94901d0 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.16    82/10/17        */
+/*     kern_resource.c 4.17    82/10/19        */

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


@@ -230,7 +230,7 @@ getrusage()
 ruadd(ru, ru2)
        register struct rusage *ru, *ru2;
 {
 ruadd(ru, ru2)
        register struct rusage *ru, *ru2;
 {

-       register u_int *ip, *ip2;
+       register long *ip, *ip2;

        register int i;
 
        timevaladd(&ru->ru_utime, &ru2->ru_utime);
        register int i;
 
        timevaladd(&ru->ru_utime, &ru2->ru_utime);

diff --git a/usr/src/sys/kern/sys_generic.c b/usr/src/sys/kern/sys_generic.c
index 987754c..f55f22b 100644 (file)
--- a/usr/src/sys/kern/sys_generic.c
+++ b/usr/src/sys/kern/sys_generic.c
@@ -1,4 +1,4 @@
-/*     sys_generic.c   5.18    82/10/17        */
+/*     sys_generic.c   5.19    82/10/19        */

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


@@ -21,6 +21,7 @@
 #endif
 #include "../h/descrip.h"
 #include "../h/uio.h"
 #endif
 #include "../h/descrip.h"
 #include "../h/uio.h"

+#include "../h/cmap.h"

 
 /*
  * Read system call.
 
 /*
  * Read system call.


@@ -200,8 +201,7 @@ rwip(ip, uio, rw)
        struct buf *bp;
        struct fs *fs;
        daddr_t lbn, bn;
        struct buf *bp;
        struct fs *fs;
        daddr_t lbn, bn;

-       register int on, type;
-       register unsigned n;
+       register int n, on, type;

        int size;
        long bsize;
        extern int mem_no;
        int size;
        long bsize;
        extern int mem_no;

diff --git a/usr/src/sys/kern/vfs_lookup.c b/usr/src/sys/kern/vfs_lookup.c
index d676e75..02c6c98 100644 (file)
--- a/usr/src/sys/kern/vfs_lookup.c
+++ b/usr/src/sys/kern/vfs_lookup.c
@@ -1,4 +1,4 @@
-/*     vfs_lookup.c    4.27    82/10/17        */
+/*     vfs_lookup.c    4.28    82/10/19        */

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


@@ -564,7 +564,7 @@ direnter(ip)
                ep->d_reclen = dsize;
                ep = (struct direct *)((char *)ep + dsize);
        }
                ep->d_reclen = dsize;
                ep = (struct direct *)((char *)ep + dsize);
        }

-       bcopy((caddr_t)&u.u_dent, (caddr_t)ep, newentrysize);
+       bcopy((caddr_t)&u.u_dent, (caddr_t)ep, (u_int)newentrysize);

        bwrite(bp);
        u.u_pdir->i_flag |= IUPD|ICHG;
        iput(u.u_pdir);
        bwrite(bp);
        u.u_pdir->i_flag |= IUPD|ICHG;
        iput(u.u_pdir);


@@ -610,10 +610,10 @@ blkatoff(ip, offset, res)
        char **res;
 {
        register struct fs *fs = ip->i_fs;
        char **res;
 {
        register struct fs *fs = ip->i_fs;

-       int lbn = lblkno(fs, offset);
+       daddr_t lbn = lblkno(fs, offset);

        int base = blkoff(fs, offset);
        int bsize = blksize(fs, ip, lbn);
        int base = blkoff(fs, offset);
        int bsize = blksize(fs, ip, lbn);

-       int bn = fsbtodb(fs, bmap(ip, lbn, B_WRITE, base, bsize));
+       daddr_t bn = fsbtodb(fs, bmap(ip, lbn, B_WRITE, base, bsize));

        register struct buf *bp;
 
        if (u.u_error)
        register struct buf *bp;
 
        if (u.u_error)

diff --git a/usr/src/sys/kern/vfs_syscalls.c b/usr/src/sys/kern/vfs_syscalls.c
index 347150b..4d9d278 100644 (file)
--- a/usr/src/sys/kern/vfs_syscalls.c
+++ b/usr/src/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/*     vfs_syscalls.c  4.40    82/10/17        */
+/*     vfs_syscalls.c  4.41    82/10/19        */

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


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

-       iupdat(ip, time, time, 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);


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

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

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


@@ -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, time, 1);
+       iupdat(ip, &time, &time, 1);

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

diff --git a/usr/src/sys/ufs/ffs/ffs_alloc.c b/usr/src/sys/ufs/ffs/ffs_alloc.c
index 6a1f2fb..6eeec10 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_alloc.c
+++ b/usr/src/sys/ufs/ffs/ffs_alloc.c
@@ -1,4 +1,4 @@
-/*     ffs_alloc.c     2.16    82/10/17        */
+/*     ffs_alloc.c     2.17    82/10/19        */

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


@@ -985,7 +985,7 @@ update()
                        continue;
                ip->i_flag |= ILOCKED;
                ip->i_count++;
                        continue;
                ip->i_flag |= ILOCKED;
                ip->i_count++;

-               iupdat(ip, time, time, 0);
+               iupdat(ip, &time, &time, 0);

                iput(ip);
        }
        updlock = 0;
                iput(ip);
        }
        updlock = 0;

diff --git a/usr/src/sys/ufs/ffs/ffs_inode.c b/usr/src/sys/ufs/ffs/ffs_inode.c
index 5c5c242..c7adeef 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_inode.c
+++ b/usr/src/sys/ufs/ffs/ffs_inode.c
@@ -1,4 +1,4 @@
-/*     ffs_inode.c     4.28    82/10/17        */
+/*     ffs_inode.c     4.29    82/10/19        */

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


@@ -248,7 +248,7 @@ irele(ip)
                        ip->i_dquot = NODQUOT;
 #endif
                }
                        ip->i_dquot = NODQUOT;
 #endif
                }

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

                iunlock(ip);
                ip->i_flag = 0;
                /*
                iunlock(ip);
                ip->i_flag = 0;
                /*


@@ -328,7 +328,6 @@ itrunc(ip, length)
        register int length;
 {
        register i;
        register int length;
 {
        register i;

-       dev_t dev;

        daddr_t bn;
        struct inode itmp;
        register struct fs *fs;
        daddr_t bn;
        struct inode itmp;
        register struct fs *fs;


@@ -357,7 +356,7 @@ itrunc(ip, length)
        for (i = 0; i < NIADDR; i++)
                itmp.i_ib[i] = 0;
        itmp.i_flag |= ICHG|IUPD;
        for (i = 0; i < NIADDR; i++)
                itmp.i_ib[i] = 0;
        itmp.i_flag |= ICHG|IUPD;

-       iupdat(&itmp, time, time, 1);
+       iupdat(&itmp, &time, &time, 1);

        ip->i_flag &= ~(IUPD|IACC|ICHG);
 
        /*
        ip->i_flag &= ~(IUPD|IACC|ICHG);
 
        /*


@@ -393,8 +392,6 @@ itrunc(ip, length)
         * finally release direct blocks
         */
        for (i = NDADDR - 1; i>=0; i--) {
         * finally release direct blocks
         */
        for (i = NDADDR - 1; i>=0; i--) {

-               register size;
-

                bn = ip->i_db[i];
                if (bn == (daddr_t)0)
                        continue;
                bn = ip->i_db[i];
                if (bn == (daddr_t)0)
                        continue;

diff --git a/usr/src/sys/ufs/ffs/ffs_vnops.c b/usr/src/sys/ufs/ffs/ffs_vnops.c
index c6231d9..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.40    82/10/17        */
+/*     ffs_vnops.c     4.41    82/10/19        */

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


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

-       iupdat(ip, time, time, 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);


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

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

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


@@ -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, time, 1);
+       iupdat(ip, &time, &time, 1);

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

diff --git a/usr/src/sys/ufs/ffs/ufs_inode.c b/usr/src/sys/ufs/ffs/ufs_inode.c
index ee689f9..3bb7ac1 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_inode.c
+++ b/usr/src/sys/ufs/ffs/ufs_inode.c
@@ -1,4 +1,4 @@
-/*     ufs_inode.c     4.28    82/10/17        */
+/*     ufs_inode.c     4.29    82/10/19        */

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


@@ -248,7 +248,7 @@ irele(ip)
                        ip->i_dquot = NODQUOT;
 #endif
                }
                        ip->i_dquot = NODQUOT;
 #endif
                }

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

                iunlock(ip);
                ip->i_flag = 0;
                /*
                iunlock(ip);
                ip->i_flag = 0;
                /*


@@ -328,7 +328,6 @@ itrunc(ip, length)
        register int length;
 {
        register i;
        register int length;
 {
        register i;

-       dev_t dev;

        daddr_t bn;
        struct inode itmp;
        register struct fs *fs;
        daddr_t bn;
        struct inode itmp;
        register struct fs *fs;


@@ -357,7 +356,7 @@ itrunc(ip, length)
        for (i = 0; i < NIADDR; i++)
                itmp.i_ib[i] = 0;
        itmp.i_flag |= ICHG|IUPD;
        for (i = 0; i < NIADDR; i++)
                itmp.i_ib[i] = 0;
        itmp.i_flag |= ICHG|IUPD;

-       iupdat(&itmp, time, time, 1);
+       iupdat(&itmp, &time, &time, 1);

        ip->i_flag &= ~(IUPD|IACC|ICHG);
 
        /*
        ip->i_flag &= ~(IUPD|IACC|ICHG);
 
        /*


@@ -393,8 +392,6 @@ itrunc(ip, length)
         * finally release direct blocks
         */
        for (i = NDADDR - 1; i>=0; i--) {
         * finally release direct blocks
         */
        for (i = NDADDR - 1; i>=0; i--) {

-               register size;
-

                bn = ip->i_db[i];
                if (bn == (daddr_t)0)
                        continue;
                bn = ip->i_db[i];
                if (bn == (daddr_t)0)
                        continue;

diff --git a/usr/src/sys/ufs/ffs/ufs_lookup.c b/usr/src/sys/ufs/ffs/ufs_lookup.c
index df792e4..52708d5 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_lookup.c
+++ b/usr/src/sys/ufs/ffs/ufs_lookup.c
@@ -1,4 +1,4 @@
-/*     ufs_lookup.c    4.27    82/10/17        */
+/*     ufs_lookup.c    4.28    82/10/19        */

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


@@ -564,7 +564,7 @@ direnter(ip)
                ep->d_reclen = dsize;
                ep = (struct direct *)((char *)ep + dsize);
        }
                ep->d_reclen = dsize;
                ep = (struct direct *)((char *)ep + dsize);
        }

-       bcopy((caddr_t)&u.u_dent, (caddr_t)ep, newentrysize);
+       bcopy((caddr_t)&u.u_dent, (caddr_t)ep, (u_int)newentrysize);

        bwrite(bp);
        u.u_pdir->i_flag |= IUPD|ICHG;
        iput(u.u_pdir);
        bwrite(bp);
        u.u_pdir->i_flag |= IUPD|ICHG;
        iput(u.u_pdir);


@@ -610,10 +610,10 @@ blkatoff(ip, offset, res)
        char **res;
 {
        register struct fs *fs = ip->i_fs;
        char **res;
 {
        register struct fs *fs = ip->i_fs;

-       int lbn = lblkno(fs, offset);
+       daddr_t lbn = lblkno(fs, offset);

        int base = blkoff(fs, offset);
        int bsize = blksize(fs, ip, lbn);
        int base = blkoff(fs, offset);
        int bsize = blksize(fs, ip, lbn);

-       int bn = fsbtodb(fs, bmap(ip, lbn, B_WRITE, base, bsize));
+       daddr_t bn = fsbtodb(fs, bmap(ip, lbn, B_WRITE, base, bsize));

        register struct buf *bp;
 
        if (u.u_error)
        register struct buf *bp;
 
        if (u.u_error)

diff --git a/usr/src/sys/ufs/ffs/ufs_vnops.c b/usr/src/sys/ufs/ffs/ufs_vnops.c
index 84bf18d..bfce703 100644 (file)
--- a/usr/src/sys/ufs/ffs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ffs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/*     ufs_vnops.c     4.40    82/10/17        */
+/*     ufs_vnops.c     4.41    82/10/19        */

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


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

-       iupdat(ip, time, time, 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);


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

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

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


@@ -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, time, 1);
+       iupdat(ip, &time, &time, 1);

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

diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c
index 5ab60e3..c1696c8 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_alloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_alloc.c
@@ -1,4 +1,4 @@
-/*     lfs_alloc.c     2.16    82/10/17        */
+/*     lfs_alloc.c     2.17    82/10/19        */

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


@@ -985,7 +985,7 @@ update()
                        continue;
                ip->i_flag |= ILOCKED;
                ip->i_count++;
                        continue;
                ip->i_flag |= ILOCKED;
                ip->i_count++;

-               iupdat(ip, time, time, 0);
+               iupdat(ip, &time, &time, 0);

                iput(ip);
        }
        updlock = 0;
                iput(ip);
        }
        updlock = 0;

diff --git a/usr/src/sys/ufs/lfs/lfs_inode.c b/usr/src/sys/ufs/lfs/lfs_inode.c
index 83b7b7a..43048b4 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_inode.c
+++ b/usr/src/sys/ufs/lfs/lfs_inode.c
@@ -1,4 +1,4 @@
-/*     lfs_inode.c     4.28    82/10/17        */
+/*     lfs_inode.c     4.29    82/10/19        */

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


@@ -248,7 +248,7 @@ irele(ip)
                        ip->i_dquot = NODQUOT;
 #endif
                }
                        ip->i_dquot = NODQUOT;
 #endif
                }

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

                iunlock(ip);
                ip->i_flag = 0;
                /*
                iunlock(ip);
                ip->i_flag = 0;
                /*


@@ -328,7 +328,6 @@ itrunc(ip, length)
        register int length;
 {
        register i;
        register int length;
 {
        register i;

-       dev_t dev;

        daddr_t bn;
        struct inode itmp;
        register struct fs *fs;
        daddr_t bn;
        struct inode itmp;
        register struct fs *fs;


@@ -357,7 +356,7 @@ itrunc(ip, length)
        for (i = 0; i < NIADDR; i++)
                itmp.i_ib[i] = 0;
        itmp.i_flag |= ICHG|IUPD;
        for (i = 0; i < NIADDR; i++)
                itmp.i_ib[i] = 0;
        itmp.i_flag |= ICHG|IUPD;

-       iupdat(&itmp, time, time, 1);
+       iupdat(&itmp, &time, &time, 1);

        ip->i_flag &= ~(IUPD|IACC|ICHG);
 
        /*
        ip->i_flag &= ~(IUPD|IACC|ICHG);
 
        /*


@@ -393,8 +392,6 @@ itrunc(ip, length)
         * finally release direct blocks
         */
        for (i = NDADDR - 1; i>=0; i--) {
         * finally release direct blocks
         */
        for (i = NDADDR - 1; i>=0; i--) {

-               register size;
-

                bn = ip->i_db[i];
                if (bn == (daddr_t)0)
                        continue;
                bn = ip->i_db[i];
                if (bn == (daddr_t)0)
                        continue;

diff --git a/usr/src/sys/ufs/lfs/lfs_vnops.c b/usr/src/sys/ufs/lfs/lfs_vnops.c
index de458ac..5cd55d8 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vnops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vnops.c
@@ -1,4 +1,4 @@
-/*     lfs_vnops.c     4.40    82/10/17        */
+/*     lfs_vnops.c     4.41    82/10/19        */

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


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

-       iupdat(ip, time, time, 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);


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

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

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


@@ -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, time, 1);
+       iupdat(ip, &time, &time, 1);

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

diff --git a/usr/src/sys/ufs/ufs/ufs_inode.c b/usr/src/sys/ufs/ufs/ufs_inode.c
index ee689f9..3bb7ac1 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_inode.c
+++ b/usr/src/sys/ufs/ufs/ufs_inode.c
@@ -1,4 +1,4 @@
-/*     ufs_inode.c     4.28    82/10/17        */
+/*     ufs_inode.c     4.29    82/10/19        */

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


@@ -248,7 +248,7 @@ irele(ip)
                        ip->i_dquot = NODQUOT;
 #endif
                }
                        ip->i_dquot = NODQUOT;
 #endif
                }

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

                iunlock(ip);
                ip->i_flag = 0;
                /*
                iunlock(ip);
                ip->i_flag = 0;
                /*


@@ -328,7 +328,6 @@ itrunc(ip, length)
        register int length;
 {
        register i;
        register int length;
 {
        register i;

-       dev_t dev;

        daddr_t bn;
        struct inode itmp;
        register struct fs *fs;
        daddr_t bn;
        struct inode itmp;
        register struct fs *fs;


@@ -357,7 +356,7 @@ itrunc(ip, length)
        for (i = 0; i < NIADDR; i++)
                itmp.i_ib[i] = 0;
        itmp.i_flag |= ICHG|IUPD;
        for (i = 0; i < NIADDR; i++)
                itmp.i_ib[i] = 0;
        itmp.i_flag |= ICHG|IUPD;

-       iupdat(&itmp, time, time, 1);
+       iupdat(&itmp, &time, &time, 1);

        ip->i_flag &= ~(IUPD|IACC|ICHG);
 
        /*
        ip->i_flag &= ~(IUPD|IACC|ICHG);
 
        /*


@@ -393,8 +392,6 @@ itrunc(ip, length)
         * finally release direct blocks
         */
        for (i = NDADDR - 1; i>=0; i--) {
         * finally release direct blocks
         */
        for (i = NDADDR - 1; i>=0; i--) {

-               register size;
-

                bn = ip->i_db[i];
                if (bn == (daddr_t)0)
                        continue;
                bn = ip->i_db[i];
                if (bn == (daddr_t)0)
                        continue;

diff --git a/usr/src/sys/ufs/ufs/ufs_lookup.c b/usr/src/sys/ufs/ufs/ufs_lookup.c
index df792e4..52708d5 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_lookup.c
+++ b/usr/src/sys/ufs/ufs/ufs_lookup.c
@@ -1,4 +1,4 @@
-/*     ufs_lookup.c    4.27    82/10/17        */
+/*     ufs_lookup.c    4.28    82/10/19        */

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


@@ -564,7 +564,7 @@ direnter(ip)
                ep->d_reclen = dsize;
                ep = (struct direct *)((char *)ep + dsize);
        }
                ep->d_reclen = dsize;
                ep = (struct direct *)((char *)ep + dsize);
        }

-       bcopy((caddr_t)&u.u_dent, (caddr_t)ep, newentrysize);
+       bcopy((caddr_t)&u.u_dent, (caddr_t)ep, (u_int)newentrysize);

        bwrite(bp);
        u.u_pdir->i_flag |= IUPD|ICHG;
        iput(u.u_pdir);
        bwrite(bp);
        u.u_pdir->i_flag |= IUPD|ICHG;
        iput(u.u_pdir);


@@ -610,10 +610,10 @@ blkatoff(ip, offset, res)
        char **res;
 {
        register struct fs *fs = ip->i_fs;
        char **res;
 {
        register struct fs *fs = ip->i_fs;

-       int lbn = lblkno(fs, offset);
+       daddr_t lbn = lblkno(fs, offset);

        int base = blkoff(fs, offset);
        int bsize = blksize(fs, ip, lbn);
        int base = blkoff(fs, offset);
        int bsize = blksize(fs, ip, lbn);

-       int bn = fsbtodb(fs, bmap(ip, lbn, B_WRITE, base, bsize));
+       daddr_t bn = fsbtodb(fs, bmap(ip, lbn, B_WRITE, base, bsize));

        register struct buf *bp;
 
        if (u.u_error)
        register struct buf *bp;
 
        if (u.u_error)

diff --git a/usr/src/sys/ufs/ufs/ufs_vnops.c b/usr/src/sys/ufs/ufs/ufs_vnops.c
index 84bf18d..bfce703 100644 (file)
--- a/usr/src/sys/ufs/ufs/ufs_vnops.c
+++ b/usr/src/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/*     ufs_vnops.c     4.40    82/10/17        */
+/*     ufs_vnops.c     4.41    82/10/19        */

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


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

-       iupdat(ip, time, time, 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);


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

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

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


@@ -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, time, 1);
+       iupdat(ip, &time, &time, 1);

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