ensure proper types for local variables and parameters

SCCS-vsn: sys/ufs/ffs/ffs_alloc.c 7.31
SCCS-vsn: sys/ufs/ffs/ffs_inode.c 7.47
SCCS-vsn: sys/ufs/ffs/ffs_extern.h 7.5

diff --git a/usr/src/sys/ufs/ffs/ffs_alloc.c b/usr/src/sys/ufs/ffs/ffs_alloc.c
index 3095be9..cd9d0a9 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_alloc.c
+++ b/usr/src/sys/ufs/ffs/ffs_alloc.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_alloc.c 7.30 (Berkeley) %G%
+ *     @(#)ffs_alloc.c 7.31 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -115,7 +115,7 @@ nospace:
  */
 ffs_realloccg(ip, lbprev, bpref, osize, nsize, bpp)
        register struct inode *ip;
  */
 ffs_realloccg(ip, lbprev, bpref, osize, nsize, bpp)
        register struct inode *ip;

-       off_t lbprev;
+       daddr_t lbprev;

        daddr_t bpref;
        int osize, nsize;
        struct buf **bpp;
        daddr_t bpref;
        int osize, nsize;
        struct buf **bpp;


@@ -232,10 +232,10 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, bpp)
 #else SECSIZE
                        munhash(ip->i_dev, bn + i * CLBYTES / DEV_BSIZE);
 #endif SECSIZE
 #else SECSIZE
                        munhash(ip->i_dev, bn + i * CLBYTES / DEV_BSIZE);
 #endif SECSIZE

-               ffs_blkfree(ip, bprev, (off_t)osize);
+               ffs_blkfree(ip, bprev, (long)osize);

                if (nsize < request)
                        ffs_blkfree(ip, bno + numfrags(fs, nsize),
                if (nsize < request)
                        ffs_blkfree(ip, bno + numfrags(fs, nsize),

-                           (off_t)(request - nsize));
+                           (long)(request - nsize));

                ip->i_blocks += btodb(nsize - osize);
                ip->i_flag |= IUPD|ICHG;
                allocbuf(bp, nsize);
                ip->i_blocks += btodb(nsize - osize);
                ip->i_flag |= IUPD|ICHG;
                allocbuf(bp, nsize);


@@ -879,7 +879,7 @@ gotit:
 ffs_blkfree(ip, bno, size)
        register struct inode *ip;
        daddr_t bno;
 ffs_blkfree(ip, bno, size)
        register struct inode *ip;
        daddr_t bno;

-       off_t size;
+       long size;

 {
        register struct fs *fs;
        register struct cg *cgp;
 {
        register struct fs *fs;
        register struct cg *cgp;

diff --git a/usr/src/sys/ufs/ffs/ffs_extern.h b/usr/src/sys/ufs/ffs/ffs_extern.h
index a852626..bfebdb6 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_extern.h
+++ b/usr/src/sys/ufs/ffs/ffs_extern.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_extern.h        7.4 (Berkeley) %G%
+ *     @(#)ffs_extern.h        7.5 (Berkeley) %G%

  */
 
 struct buf;
  */
 
 struct buf;

diff --git a/usr/src/sys/ufs/ffs/ffs_inode.c b/usr/src/sys/ufs/ffs/ffs_inode.c
index bdd666b..62fe626 100644 (file)
--- a/usr/src/sys/ufs/ffs/ffs_inode.c
+++ b/usr/src/sys/ufs/ffs/ffs_inode.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ffs_inode.c 7.46 (Berkeley) %G%
+ *     @(#)ffs_inode.c 7.47 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>