daddr_t => ufs_daddr_t

SCCS-vsn: sbin/fsck/inode.c 8.6
SCCS-vsn: sbin/fsck/pass1.c 8.3
SCCS-vsn: sbin/fsck/pass1b.c 8.2
SCCS-vsn: sbin/fsck/utilities.c 8.2
SCCS-vsn: sbin/fsck/main.c 8.3
SCCS-vsn: sbin/fsck/pass5.c 8.7
SCCS-vsn: sbin/fsck/dir.c 8.6
SCCS-vsn: sbin/fsck/fsck.h 8.2
SCCS-vsn: sbin/fsck/pass4.c 8.2
SCCS-vsn: sbin/fsck/setup.c 8.7

diff --git a/usr/src/sbin/fsck/dir.c b/usr/src/sbin/fsck/dir.c
index 7104739..47a2d82 100644 (file)
--- a/usr/src/sbin/fsck/dir.c
+++ b/usr/src/sbin/fsck/dir.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)dir.c      8.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)dir.c      8.6 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -513,7 +513,7 @@ expanddir(dp, name)
        register struct dinode *dp;
        char *name;
 {
        register struct dinode *dp;
        char *name;
 {

-       daddr_t lastbn, newblk;
+       ufs_daddr_t lastbn, newblk;

        register struct bufarea *bp;
        char *cp, firstblk[DIRBLKSIZ];
 
        register struct bufarea *bp;
        char *cp, firstblk[DIRBLKSIZ];
 


@@ -664,7 +664,7 @@ lftempname(bufp, ino)
  */
 struct bufarea *
 getdirblk(blkno, size)
  */
 struct bufarea *
 getdirblk(blkno, size)

-       daddr_t blkno;
+       ufs_daddr_t blkno;

        long size;
 {
 
        long size;
 {
 

diff --git a/usr/src/sbin/fsck/fsck.h b/usr/src/sbin/fsck/fsck.h
index b6ca1b3..93ee9ac 100644 (file)
--- a/usr/src/sbin/fsck/fsck.h
+++ b/usr/src/sbin/fsck/fsck.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)fsck.h      8.1 (Berkeley) %G%
+ *     @(#)fsck.h      8.2 (Berkeley) %G%

  */
 
 #define        MAXDUP          10      /* limit on dup blks (per inode) */
  */
 
 #define        MAXDUP          10      /* limit on dup blks (per inode) */


@@ -27,20 +27,20 @@
  * buffer cache structure.
  */
 struct bufarea {
  * buffer cache structure.
  */
 struct bufarea {

-       struct bufarea  *b_next;                /* free list queue */
-       struct bufarea  *b_prev;                /* free list queue */
-       daddr_t b_bno;
-       int     b_size;
-       int     b_errs;
-       int     b_flags;
+       struct bufarea *b_next;         /* free list queue */
+       struct bufarea *b_prev;         /* free list queue */
+       ufs_daddr_t b_bno;
+       int b_size;
+       int b_errs;
+       int b_flags;

        union {
        union {

-               char    *b_buf;                 /* buffer space */
-               daddr_t *b_indir;               /* indirect block */
-               struct  fs *b_fs;               /* super block */
-               struct  cg *b_cg;               /* cylinder group */
-               struct  dinode *b_dinode;       /* inode block */
+               char *b_buf;                    /* buffer space */
+               ufs_daddr_t *b_indir;           /* indirect block */
+               struct fs *b_fs;                /* super block */
+               struct cg *b_cg;                /* cylinder group */
+               struct dinode *b_dinode;        /* inode block */

        } b_un;
        } b_un;

-       char    b_dirty;
+       char b_dirty;

 };
 
 #define        B_INUSE 1
 };
 
 #define        B_INUSE 1


@@ -56,7 +56,7 @@ struct bufarea *getdatablk();
 #define        dirty(bp)       (bp)->b_dirty = 1
 #define        initbarea(bp) \
        (bp)->b_dirty = 0; \
 #define        dirty(bp)       (bp)->b_dirty = 1
 #define        initbarea(bp) \
        (bp)->b_dirty = 0; \

-       (bp)->b_bno = (daddr_t)-1; \
+       (bp)->b_bno = (ufs_daddr_t)-1; \

        (bp)->b_flags = 0;
 
 #define        sbdirty()       sblk.b_dirty = 1
        (bp)->b_flags = 0;
 
 #define        sbdirty()       sblk.b_dirty = 1


@@ -71,7 +71,7 @@ struct inodesc {
        int (*id_func)();       /* function to be applied to blocks of inode */
        ino_t id_number;        /* inode number described */
        ino_t id_parent;        /* for DATA nodes, their parent */
        int (*id_func)();       /* function to be applied to blocks of inode */
        ino_t id_number;        /* inode number described */
        ino_t id_parent;        /* for DATA nodes, their parent */

-       daddr_t id_blkno;       /* current block number being examined */
+       ufs_daddr_t id_blkno;   /* current block number being examined */

        int id_numfrags;        /* number of frags contained in block */
        quad_t id_filesize;     /* for DATA nodes, the size of the directory */
        int id_loc;             /* for DATA nodes, current location in dir */
        int id_numfrags;        /* number of frags contained in block */
        quad_t id_filesize;     /* for DATA nodes, the size of the directory */
        int id_loc;             /* for DATA nodes, current location in dir */


@@ -107,7 +107,7 @@ struct inodesc {
  */
 struct dups {
        struct dups *next;
  */
 struct dups {
        struct dups *next;

-       daddr_t dup;
+       ufs_daddr_t dup;

 };
 struct dups *duplist;          /* head of dup list */
 struct dups *muldup;           /* end of unique duplicate dup block numbers */
 };
 struct dups *duplist;          /* head of dup list */
 struct dups *muldup;           /* end of unique duplicate dup block numbers */


@@ -131,7 +131,7 @@ struct inoinfo {
        ino_t   i_dotdot;               /* inode number of `..' */
        size_t  i_isize;                /* size of inode */
        u_int   i_numblks;              /* size of block array in bytes */
        ino_t   i_dotdot;               /* inode number of `..' */
        size_t  i_isize;                /* size of inode */
        u_int   i_numblks;              /* size of block array in bytes */

-       daddr_t i_blks[1];              /* actually longer */
+       ufs_daddr_t i_blks[1];          /* actually longer */

 } **inphead, **inpsort;
 long numdirs, listmax, inplast;
 
 } **inphead, **inpsort;
 long numdirs, listmax, inplast;
 


@@ -153,7 +153,7 @@ int fsmodified;             /* 1 => write done to file system */
 int    fsreadfd;               /* file descriptor for reading file system */
 int    fswritefd;              /* file descriptor for writing file system */
 
 int    fsreadfd;               /* file descriptor for reading file system */
 int    fswritefd;              /* file descriptor for writing file system */
 

-daddr_t        maxfsblock;             /* number of blocks in the file system */
+ufs_daddr_t maxfsblock;                /* number of blocks in the file system */

 char   *blockmap;              /* ptr to primary blk allocation map */
 ino_t  maxino;                 /* number of inodes in file system */
 ino_t  lastino;                /* last inode in use */
 char   *blockmap;              /* ptr to primary blk allocation map */
 ino_t  maxino;                 /* number of inodes in file system */
 ino_t  lastino;                /* last inode in use */


@@ -165,8 +165,8 @@ ino_t       lfdir;                  /* lost & found directory inode number */
 char   *lfname;                /* lost & found directory name */
 int    lfmode;                 /* lost & found directory creation mode */
 
 char   *lfname;                /* lost & found directory name */
 int    lfmode;                 /* lost & found directory creation mode */
 

-daddr_t        n_blks;                 /* number of blocks in use */
-daddr_t        n_files;                /* number of files in use */
+ufs_daddr_t n_blks;            /* number of blocks in use */
+ufs_daddr_t n_files;           /* number of files in use */

 
 #define        clearinode(dp)  (*(dp) = zino)
 struct dinode zino;
 
 #define        clearinode(dp)  (*(dp) = zino)
 struct dinode zino;

diff --git a/usr/src/sbin/fsck/inode.c b/usr/src/sbin/fsck/inode.c
index 88170db..5509e6a 100644 (file)
--- a/usr/src/sbin/fsck/inode.c
+++ b/usr/src/sbin/fsck/inode.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)inode.c    8.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)inode.c    8.6 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -25,7 +25,7 @@ ckinode(dp, idesc)
        struct dinode *dp;
        register struct inodesc *idesc;
 {
        struct dinode *dp;
        register struct inodesc *idesc;
 {

-       register daddr_t *ap;
+       ufs_daddr_t *ap;

        long ret, n, ndb, offset;
        struct dinode dino;
        quad_t remsize, sizepb;
        long ret, n, ndb, offset;
        struct dinode dino;
        quad_t remsize, sizepb;


@@ -78,9 +78,9 @@ iblock(idesc, ilevel, isize)
        long ilevel;
        quad_t isize;
 {
        long ilevel;
        quad_t isize;
 {

-       register daddr_t *ap;
-       register daddr_t *aplim;
-       register struct bufarea *bp;
+       ufs_daddr_t *ap;
+       ufs_daddr_t *aplim;
+       struct bufarea *bp;

        int i, n, (*func)(), nif;
        quad_t sizepb;
        char buf[BUFSIZ];
        int i, n, (*func)(), nif;
        quad_t sizepb;
        char buf[BUFSIZ];


@@ -139,7 +139,7 @@ iblock(idesc, ilevel, isize)
  * Return 0 if in range, 1 if out of range.
  */
 chkrange(blk, cnt)
  * Return 0 if in range, 1 if out of range.
  */
 chkrange(blk, cnt)

-       daddr_t blk;
+       ufs_daddr_t blk;

        int cnt;
 {
        register int c;
        int cnt;
 {
        register int c;


@@ -178,7 +178,7 @@ struct dinode *
 ginode(inumber)
        ino_t inumber;
 {
 ginode(inumber)
        ino_t inumber;
 {

-       daddr_t iblk;
+       ufs_daddr_t iblk;

 
        if (inumber < ROOTINO || inumber > maxino)
                errexit("bad inode number %d to ginode\n", inumber);
 
        if (inumber < ROOTINO || inumber > maxino)
                errexit("bad inode number %d to ginode\n", inumber);


@@ -206,7 +206,7 @@ getnextinode(inumber)
        ino_t inumber;
 {
        long size;
        ino_t inumber;
 {
        long size;

-       daddr_t dblk;
+       ufs_daddr_t dblk;

        static struct dinode *dp;
 
        if (inumber != nextino++ || inumber > maxino)
        static struct dinode *dp;
 
        if (inumber != nextino++ || inumber > maxino)


@@ -279,7 +279,7 @@ cacheino(dp, inumber)
        if (blks > NDADDR)
                blks = NDADDR + NIADDR;
        inp = (struct inoinfo *)
        if (blks > NDADDR)
                blks = NDADDR + NIADDR;
        inp = (struct inoinfo *)

-               malloc(sizeof(*inp) + (blks - 1) * sizeof(daddr_t));
+               malloc(sizeof(*inp) + (blks - 1) * sizeof(ufs_daddr_t));

        if (inp == NULL)
                return;
        inpp = &inphead[inumber % numdirs];
        if (inp == NULL)
                return;
        inpp = &inphead[inumber % numdirs];


@@ -292,7 +292,7 @@ cacheino(dp, inumber)
        inp->i_dotdot = (ino_t)0;
        inp->i_number = inumber;
        inp->i_isize = dp->di_size;
        inp->i_dotdot = (ino_t)0;
        inp->i_number = inumber;
        inp->i_isize = dp->di_size;

-       inp->i_numblks = blks * sizeof(daddr_t);
+       inp->i_numblks = blks * sizeof(ufs_daddr_t);

        bcopy((char *)&dp->di_db[0], (char *)&inp->i_blks[0],
            (size_t)inp->i_numblks);
        if (inplast == listmax) {
        bcopy((char *)&dp->di_db[0], (char *)&inp->i_blks[0],
            (size_t)inp->i_numblks);
        if (inplast == listmax) {


@@ -416,14 +416,14 @@ pinode(ino)
        if (preen)
                printf("%s: ", cdevname);
        printf("SIZE=%qu ", dp->di_size);
        if (preen)
                printf("%s: ", cdevname);
        printf("SIZE=%qu ", dp->di_size);

-       p = ctime(&dp->di_mtime.ts_sec);
+       p = ctime(&dp->di_mtime);

        printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]);
 }
 
 blkerror(ino, type, blk)
        ino_t ino;
        char *type;
        printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]);
 }
 
 blkerror(ino, type, blk)
        ino_t ino;
        char *type;

-       daddr_t blk;
+       ufs_daddr_t blk;

 {
 
        pfatal("%ld %s I=%lu", blk, type, ino);
 {
 
        pfatal("%ld %s I=%lu", blk, type, ino);


@@ -486,7 +486,7 @@ allocino(request, type)
                return (0);
        }
        dp->di_mode = type;
                return (0);
        }
        dp->di_mode = type;

-       (void)time(&dp->di_atime.ts_sec);
+       (void)time(&dp->di_atime);

        dp->di_mtime = dp->di_ctime = dp->di_atime;
        dp->di_size = sblock.fs_fsize;
        dp->di_blocks = btodb(sblock.fs_fsize);
        dp->di_mtime = dp->di_ctime = dp->di_atime;
        dp->di_size = sblock.fs_fsize;
        dp->di_blocks = btodb(sblock.fs_fsize);

diff --git a/usr/src/sbin/fsck/main.c b/usr/src/sbin/fsck/main.c
index 3613a6e..710efd3 100644 (file)
--- a/usr/src/sbin/fsck/main.c
+++ b/usr/src/sbin/fsck/main.c
@@ -12,7 +12,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     8.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     8.3 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -141,7 +141,7 @@ checkfilesys(filesys, mntpt, auxdata, child)
        char *filesys, *mntpt;
        long auxdata;
 {
        char *filesys, *mntpt;
        long auxdata;
 {

-       daddr_t n_ffree, n_bfree;
+       ufs_daddr_t n_ffree, n_bfree;

        struct dups *dp;
        struct zlncnt *zlnp;
        int cylno;
        struct dups *dp;
        struct zlncnt *zlnp;
        int cylno;

diff --git a/usr/src/sbin/fsck/pass1.c b/usr/src/sbin/fsck/pass1.c
index 7b85d8f..c3eb787 100644 (file)
--- a/usr/src/sbin/fsck/pass1.c
+++ b/usr/src/sbin/fsck/pass1.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pass1.c    8.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass1.c    8.3 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -18,8 +18,8 @@ static char sccsid[] = "@(#)pass1.c   8.2 (Berkeley) %G%";
 #include <string.h>
 #include "fsck.h"
 
 #include <string.h>
 #include "fsck.h"
 

-static daddr_t badblk;
-static daddr_t dupblk;
+static ufs_daddr_t badblk;
+static ufs_daddr_t dupblk;

 int pass1check();
 struct dinode *getnextinode();
 
 int pass1check();
 struct dinode *getnextinode();
 


@@ -75,9 +75,9 @@ checkinode(inumber, idesc)
        mode = dp->di_mode & IFMT;
        if (mode == 0) {
                if (bcmp((char *)dp->di_db, (char *)zino.di_db,
        mode = dp->di_mode & IFMT;
        if (mode == 0) {
                if (bcmp((char *)dp->di_db, (char *)zino.di_db,

-                       NDADDR * sizeof(daddr_t)) ||
+                       NDADDR * sizeof(ufs_daddr_t)) ||

                    bcmp((char *)dp->di_ib, (char *)zino.di_ib,
                    bcmp((char *)dp->di_ib, (char *)zino.di_ib,

-                       NIADDR * sizeof(daddr_t)) ||
+                       NIADDR * sizeof(ufs_daddr_t)) ||

                    dp->di_mode || dp->di_size) {
                        pfatal("PARTIALLY ALLOCATED INODE I=%lu", inumber);
                        if (reply("CLEAR") == 1) {
                    dp->di_mode || dp->di_size) {
                        pfatal("PARTIALLY ALLOCATED INODE I=%lu", inumber);
                        if (reply("CLEAR") == 1) {


@@ -136,7 +136,7 @@ checkinode(inumber, idesc)
                 * will detect any garbage after symlink string.
                 */
                if (dp->di_size < sblock.fs_maxsymlinklen) {
                 * will detect any garbage after symlink string.
                 */
                if (dp->di_size < sblock.fs_maxsymlinklen) {

-                       ndb = howmany(dp->di_size, sizeof(daddr_t));
+                       ndb = howmany(dp->di_size, sizeof(ufs_daddr_t));

                        if (ndb > NDADDR) {
                                j = ndb - NDADDR;
                                for (ndb = 1; j > 1; j--)
                        if (ndb > NDADDR) {
                                j = ndb - NDADDR;
                                for (ndb = 1; j > 1; j--)


@@ -238,7 +238,7 @@ pass1check(idesc)
 {
        int res = KEEPON;
        int anyout, nfrags;
 {
        int res = KEEPON;
        int anyout, nfrags;

-       daddr_t blkno = idesc->id_blkno;
+       ufs_daddr_t blkno = idesc->id_blkno;

        register struct dups *dlp;
        struct dups *new;
 
        register struct dups *dlp;
        struct dups *new;
 

diff --git a/usr/src/sbin/fsck/pass1b.c b/usr/src/sbin/fsck/pass1b.c
index 9fab10c..81018b5 100644 (file)
--- a/usr/src/sbin/fsck/pass1b.c
+++ b/usr/src/sbin/fsck/pass1b.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pass1b.c   8.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass1b.c   8.2 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -51,7 +51,7 @@ pass1bcheck(idesc)
 {
        register struct dups *dlp;
        int nfrags, res = KEEPON;
 {
        register struct dups *dlp;
        int nfrags, res = KEEPON;

-       daddr_t blkno = idesc->id_blkno;
+       ufs_daddr_t blkno = idesc->id_blkno;

 
        for (nfrags = idesc->id_numfrags; nfrags > 0; blkno++, nfrags--) {
                if (chkrange(blkno, 1))
 
        for (nfrags = idesc->id_numfrags; nfrags > 0; blkno++, nfrags--) {
                if (chkrange(blkno, 1))

diff --git a/usr/src/sbin/fsck/pass4.c b/usr/src/sbin/fsck/pass4.c
index 84d39e2..97b1430 100644 (file)
--- a/usr/src/sbin/fsck/pass4.c
+++ b/usr/src/sbin/fsck/pass4.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pass4.c    8.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass4.c    8.2 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -82,7 +82,7 @@ pass4check(idesc)
 {
        register struct dups *dlp;
        int nfrags, res = KEEPON;
 {
        register struct dups *dlp;
        int nfrags, res = KEEPON;

-       daddr_t blkno = idesc->id_blkno;
+       ufs_daddr_t blkno = idesc->id_blkno;

 
        for (nfrags = idesc->id_numfrags; nfrags > 0; blkno++, nfrags--) {
                if (chkrange(blkno, 1)) {
 
        for (nfrags = idesc->id_numfrags; nfrags > 0; blkno++, nfrags--) {
                if (chkrange(blkno, 1)) {

diff --git a/usr/src/sbin/fsck/pass5.c b/usr/src/sbin/fsck/pass5.c
index 01ced74..178382f 100644 (file)
--- a/usr/src/sbin/fsck/pass5.c
+++ b/usr/src/sbin/fsck/pass5.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)pass5.c    8.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)pass5.c    8.7 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -19,11 +19,11 @@ static char sccsid[] = "@(#)pass5.c 8.6 (Berkeley) %G%";
 pass5()
 {
        int c, blk, frags, basesize, sumsize, mapsize, savednrpos;
 pass5()
 {
        int c, blk, frags, basesize, sumsize, mapsize, savednrpos;

-       register struct fs *fs = &sblock;
-       register struct cg *cg = &cgrp;
-       daddr_t dbase, dmax;
-       register daddr_t d;
-       register long i, j;
+       struct fs *fs = &sblock;
+       struct cg *cg = &cgrp;
+       ufs_daddr_t dbase, dmax;
+       ufs_daddr_t d;
+       long i, j;

        struct csum *cs;
        struct csum cstotal;
        struct inodesc idesc[3];
        struct csum *cs;
        struct csum cstotal;
        struct inodesc idesc[3];

diff --git a/usr/src/sbin/fsck/setup.c b/usr/src/sbin/fsck/setup.c
index 2fc78d8..1e9a171 100644 (file)
--- a/usr/src/sbin/fsck/setup.c
+++ b/usr/src/sbin/fsck/setup.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)setup.c    8.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)setup.c    8.7 (Berkeley) %G%";

 #endif /* not lint */
 
 #define DKTYPENAMES
 #endif /* not lint */
 
 #define DKTYPENAMES


@@ -264,7 +264,7 @@ badsb:
 readsb(listerr)
        int listerr;
 {
 readsb(listerr)
        int listerr;
 {

-       daddr_t super = bflag ? bflag : SBOFF / dev_bsize;
+       ufs_daddr_t super = bflag ? bflag : SBOFF / dev_bsize;

 
        if (bread(fsreadfd, (char *)&sblock, super, (long)SBSIZE) != 0)
                return (0);
 
        if (bread(fsreadfd, (char *)&sblock, super, (long)SBSIZE) != 0)
                return (0);

diff --git a/usr/src/sbin/fsck/utilities.c b/usr/src/sbin/fsck/utilities.c
index 90f812e..7c695a9 100644 (file)
--- a/usr/src/sbin/fsck/utilities.c
+++ b/usr/src/sbin/fsck/utilities.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)utilities.c        8.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)utilities.c        8.2 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -117,7 +117,7 @@ bufinit()
  */
 struct bufarea *
 getdatablk(blkno, size)
  */
 struct bufarea *
 getdatablk(blkno, size)

-       daddr_t blkno;
+       ufs_daddr_t blkno;

        long size;
 {
        register struct bufarea *bp;
        long size;
 {
        register struct bufarea *bp;


@@ -147,10 +147,10 @@ foundit:
 void
 getblk(bp, blk, size)
        register struct bufarea *bp;
 void
 getblk(bp, blk, size)
        register struct bufarea *bp;

-       daddr_t blk;
+       ufs_daddr_t blk;

        long size;
 {
        long size;
 {

-       daddr_t dblk;
+       ufs_daddr_t dblk;

 
        dblk = fsbtodb(&sblock, blk);
        if (bp->b_bno != dblk) {
 
        dblk = fsbtodb(&sblock, blk);
        if (bp->b_bno != dblk) {


@@ -189,7 +189,7 @@ flush(fd, bp)
 
 rwerror(mesg, blk)
        char *mesg;
 
 rwerror(mesg, blk)
        char *mesg;

-       daddr_t blk;
+       ufs_daddr_t blk;

 {
 
        if (preen == 0)
 {
 
        if (preen == 0)


@@ -237,7 +237,7 @@ ckfini()
 bread(fd, buf, blk, size)
        int fd;
        char *buf;
 bread(fd, buf, blk, size)
        int fd;
        char *buf;

-       daddr_t blk;
+       ufs_daddr_t blk;

        long size;
 {
        char *cp;
        long size;
 {
        char *cp;


@@ -275,7 +275,7 @@ bread(fd, buf, blk, size)
 bwrite(fd, buf, blk, size)
        int fd;
        char *buf;
 bwrite(fd, buf, blk, size)
        int fd;
        char *buf;

-       daddr_t blk;
+       ufs_daddr_t blk;

        long size;
 {
        int i;
        long size;
 {
        int i;


@@ -339,7 +339,7 @@ allocblk(frags)
  * Free a previously allocated block
  */
 freeblk(blkno, frags)
  * Free a previously allocated block
  */
 freeblk(blkno, frags)

-       daddr_t blkno;
+       ufs_daddr_t blkno;

        long frags;
 {
        struct inodesc idesc;
        long frags;
 {
        struct inodesc idesc;