daddr_t => ufs_daddr_t

SCCS-vsn: sys/ufs/lfs/lfs_balloc.c 8.2
SCCS-vsn: sys/ufs/lfs/lfs_subr.c 8.3
SCCS-vsn: sys/ufs/lfs/lfs.h 8.8
SCCS-vsn: sys/ufs/lfs/lfs_bio.c 8.5
SCCS-vsn: sys/ufs/lfs/lfs_vfsops.c 8.11
SCCS-vsn: sys/ufs/lfs/lfs_alloc.c 8.5
SCCS-vsn: sys/ufs/lfs/lfs_inode.c 8.7
SCCS-vsn: sys/ufs/lfs/lfs_extern.h 8.4
SCCS-vsn: sys/ufs/lfs/lfs_segment.c 8.7
SCCS-vsn: sys/ufs/lfs/lfs_syscalls.c 8.7

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

- *     @(#)lfs.h       8.7 (Berkeley) %G%
+ *     @(#)lfs.h       8.8 (Berkeley) %G%

  */
 
 #define        LFS_LABELPAD    8192            /* LFS label size */
  */
 
 #define        LFS_LABELPAD    8192            /* LFS label size */


@@ -50,7 +50,7 @@ struct finfo {
        u_int32_t fi_nblocks;           /* number of blocks */
        u_int32_t fi_version;           /* version number */
        u_int32_t fi_ino;               /* inode number */
        u_int32_t fi_nblocks;           /* number of blocks */
        u_int32_t fi_version;           /* version number */
        u_int32_t fi_ino;               /* inode number */

-       daddr_t   fi_blocks[1];         /* array of logical block numbers */
+       ufs_daddr_t       fi_blocks[1]; /* array of logical block numbers */

 };
 
 /* On-disk and in-memory super block. */
 };
 
 /* On-disk and in-memory super block. */


@@ -73,13 +73,13 @@ struct lfs {
        u_int32_t lfs_nfiles;           /* number of allocated inodes */
        int32_t   lfs_avail;            /* blocks available for writing */
        u_int32_t lfs_uinodes;          /* inodes in cache not yet on disk */
        u_int32_t lfs_nfiles;           /* number of allocated inodes */
        int32_t   lfs_avail;            /* blocks available for writing */
        u_int32_t lfs_uinodes;          /* inodes in cache not yet on disk */

-       daddr_t   lfs_idaddr;           /* inode file disk address */
+       ufs_daddr_t lfs_idaddr;         /* inode file disk address */

        ino_t     lfs_ifile;            /* inode file inode number */
        ino_t     lfs_ifile;            /* inode file inode number */

-       daddr_t   lfs_lastseg;          /* address of last segment written */
-       daddr_t   lfs_nextseg;          /* address of next segment to write */
-       daddr_t   lfs_curseg;           /* current segment being written */
-       daddr_t   lfs_offset;           /* offset in curseg for next partial */
-       daddr_t   lfs_lastpseg;         /* address of last partial written */
+       ufs_daddr_t lfs_lastseg;        /* address of last segment written */
+       ufs_daddr_t lfs_nextseg;        /* address of next segment to write */
+       ufs_daddr_t lfs_curseg;         /* current segment being written */
+       ufs_daddr_t lfs_offset;         /* offset in curseg for next partial */
+       ufs_daddr_t lfs_lastpseg;       /* address of last partial written */

        u_int32_t lfs_tstamp;           /* time stamp */
 
 /* These are configuration parameters. */
        u_int32_t lfs_tstamp;           /* time stamp */
 
 /* These are configuration parameters. */


@@ -112,7 +112,7 @@ struct lfs {
 
 #define        LFS_MIN_SBINTERVAL      5       /* minimum superblock segment spacing */
 #define        LFS_MAXNUMSB            10      /* superblock disk offsets */
 
 #define        LFS_MIN_SBINTERVAL      5       /* minimum superblock segment spacing */
 #define        LFS_MAXNUMSB            10      /* superblock disk offsets */

-       daddr_t   lfs_sboffs[LFS_MAXNUMSB];
+       ufs_daddr_t lfs_sboffs[LFS_MAXNUMSB];

 
 /* Checksum -- last valid disk field. */
        u_int32_t lfs_cksum;            /* checksum for superblock checking */
 
 /* Checksum -- last valid disk field. */
        u_int32_t lfs_cksum;            /* checksum for superblock checking */


@@ -162,7 +162,7 @@ typedef struct ifile IFILE;
 struct ifile {
        u_int32_t if_version;           /* inode version number */
 #define        LFS_UNUSED_DADDR        0       /* out-of-band daddr */
 struct ifile {
        u_int32_t if_version;           /* inode version number */
 #define        LFS_UNUSED_DADDR        0       /* out-of-band daddr */

-       daddr_t   if_daddr;             /* inode disk address */
+       ufs_daddr_t if_daddr;           /* inode disk address */

        ino_t     if_nextfree;          /* next-unallocated inode */
 };
 
        ino_t     if_nextfree;          /* next-unallocated inode */
 };
 


@@ -189,7 +189,7 @@ typedef struct segsum SEGSUM;
 struct segsum {
        u_int32_t ss_sumsum;            /* check sum of summary block */
        u_int32_t ss_datasum;           /* check sum of data */
 struct segsum {
        u_int32_t ss_sumsum;            /* check sum of summary block */
        u_int32_t ss_datasum;           /* check sum of data */

-       daddr_t   ss_next;              /* next segment */
+       ufs_daddr_t ss_next;            /* next segment */

        u_int32_t ss_create;            /* creation time stamp */
        u_int16_t ss_nfinfo;            /* number of file info structures */
        u_int16_t ss_ninos;             /* number of inodes in summary */
        u_int32_t ss_create;            /* creation time stamp */
        u_int16_t ss_nfinfo;            /* number of file info structures */
        u_int16_t ss_ninos;             /* number of inodes in summary */


@@ -219,14 +219,14 @@ struct segsum {
 #define        datosn(fs, daddr)       /* disk address to segment number */    \
        (((daddr) - (fs)->lfs_sboffs[0]) / fsbtodb((fs), (fs)->lfs_ssize))
 #define sntoda(fs, sn)                 /* segment number to disk address */    \
 #define        datosn(fs, daddr)       /* disk address to segment number */    \
        (((daddr) - (fs)->lfs_sboffs[0]) / fsbtodb((fs), (fs)->lfs_ssize))
 #define sntoda(fs, sn)                 /* segment number to disk address */    \

-       ((daddr_t)((sn) * ((fs)->lfs_ssize << (fs)->lfs_fsbtodb) +      \
+       ((ufs_daddr_t)((sn) * ((fs)->lfs_ssize << (fs)->lfs_fsbtodb) +  \

            (fs)->lfs_sboffs[0]))
 
 /* Read in the block with the cleaner info from the ifile. */
 #define LFS_CLEANERINFO(CP, F, BP) {                                   \
        VTOI((F)->lfs_ivnode)->i_flag |= IN_ACCESS;                     \
        if (bread((F)->lfs_ivnode,                                      \
            (fs)->lfs_sboffs[0]))
 
 /* Read in the block with the cleaner info from the ifile. */
 #define LFS_CLEANERINFO(CP, F, BP) {                                   \
        VTOI((F)->lfs_ivnode)->i_flag |= IN_ACCESS;                     \
        if (bread((F)->lfs_ivnode,                                      \

-           (daddr_t)0, (F)->lfs_bsize, NOCRED, &(BP)))                 \
+           (ufs_daddr_t)0, (F)->lfs_bsize, NOCRED, &(BP)))             \

                panic("lfs: ifile read");                               \
        (CP) = (CLEANERINFO *)(BP)->b_data;                             \
 }
                panic("lfs: ifile read");                               \
        (CP) = (CLEANERINFO *)(BP)->b_data;                             \
 }


@@ -273,8 +273,8 @@ struct segsum {
  */
 typedef struct block_info {
        ino_t   bi_inode;               /* inode # */
  */
 typedef struct block_info {
        ino_t   bi_inode;               /* inode # */

-       daddr_t bi_lbn;                 /* logical block w/in file */
-       daddr_t bi_daddr;               /* disk address of block */
+       ufs_daddr_t bi_lbn;             /* logical block w/in file */
+       ufs_daddr_t bi_daddr;           /* disk address of block */

        time_t  bi_segcreate;           /* origin segment create time */
        int     bi_version;             /* file version number */
        void    *bi_bp;                 /* data buffer */
        time_t  bi_segcreate;           /* origin segment create time */
        int     bi_version;             /* file version number */
        void    *bi_bp;                 /* data buffer */


@@ -294,7 +294,7 @@ struct segment {
        u_int32_t seg_bytes_left;       /* bytes left in segment */
        u_int32_t sum_bytes_left;       /* bytes left in summary block */
        u_int32_t seg_number;           /* number of this segment */
        u_int32_t seg_bytes_left;       /* bytes left in segment */
        u_int32_t sum_bytes_left;       /* bytes left in summary block */
        u_int32_t seg_number;           /* number of this segment */

-       daddr_t  *start_lbp;            /* beginning lbn for this set */
+       ufs_daddr_t *start_lbp;         /* beginning lbn for this set */

 
 #define        SEGM_CKP        0x01            /* doing a checkpoint */
 #define        SEGM_CLEAN      0x02            /* cleaner call; don't sort */
 
 #define        SEGM_CKP        0x01            /* doing a checkpoint */
 #define        SEGM_CLEAN      0x02            /* cleaner call; don't sort */

diff --git a/usr/src/sys/ufs/lfs/lfs_alloc.c b/usr/src/sys/ufs/lfs/lfs_alloc.c
index 2641590..6477b1e 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_alloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_alloc.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_alloc.c 8.4 (Berkeley) %G%
+ *     @(#)lfs_alloc.c 8.5 (Berkeley) %G%

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


@@ -42,7 +42,7 @@ lfs_valloc(ap)
        struct ifile *ifp;
        struct inode *ip;
        struct vnode *vp;
        struct ifile *ifp;
        struct inode *ip;
        struct vnode *vp;

-       daddr_t blkno;
+       ufs_daddr_t blkno;

        ino_t new_ino;
        u_long i, max;
        int error;
        ino_t new_ino;
        u_long i, max;
        int error;


@@ -183,7 +183,7 @@ lfs_vfree(ap)
        struct ifile *ifp;
        struct inode *ip;
        struct lfs *fs;
        struct ifile *ifp;
        struct inode *ip;
        struct lfs *fs;

-       daddr_t old_iaddr;
+       ufs_daddr_t old_iaddr;

        ino_t ino;
 
        /* Get the inode number and file system. */
        ino_t ino;
 
        /* Get the inode number and file system. */

diff --git a/usr/src/sys/ufs/lfs/lfs_balloc.c b/usr/src/sys/ufs/lfs/lfs_balloc.c
index 9e13b73..20933d9 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_balloc.c
+++ b/usr/src/sys/ufs/lfs/lfs_balloc.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_balloc.c        8.1 (Berkeley) %G%
+ *     @(#)lfs_balloc.c        8.2 (Berkeley) %G%

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


@@ -27,14 +27,14 @@ int
 lfs_balloc(vp, iosize, lbn, bpp)
        struct vnode *vp;
        u_long iosize;
 lfs_balloc(vp, iosize, lbn, bpp)
        struct vnode *vp;
        u_long iosize;

-       daddr_t lbn;
+       ufs_daddr_t lbn;

        struct buf **bpp;
 {
        struct buf *ibp, *bp;
        struct inode *ip;
        struct lfs *fs;
        struct indir indirs[NIADDR+2];
        struct buf **bpp;
 {
        struct buf *ibp, *bp;
        struct inode *ip;
        struct lfs *fs;
        struct indir indirs[NIADDR+2];

-       daddr_t daddr;
+       ufs_daddr_t daddr;

        int bb, error, i, num;
 
        ip = VTOI(vp);
        int bb, error, i, num;
 
        ip = VTOI(vp);

diff --git a/usr/src/sys/ufs/lfs/lfs_bio.c b/usr/src/sys/ufs/lfs/lfs_bio.c
index ea075cb..42c9aa9 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_bio.c
+++ b/usr/src/sys/ufs/lfs/lfs_bio.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_bio.c   8.4 (Berkeley) %G%
+ *     @(#)lfs_bio.c   8.5 (Berkeley) %G%

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


@@ -137,7 +137,7 @@ lfs_flush()
 int
 lfs_check(vp, blkno)
        struct vnode *vp;
 int
 lfs_check(vp, blkno)
        struct vnode *vp;

-       daddr_t blkno;
+       ufs_daddr_t blkno;

 {
        extern int lfs_allclean_wakeup;
        int error;
 {
        extern int lfs_allclean_wakeup;
        int error;

diff --git a/usr/src/sys/ufs/lfs/lfs_extern.h b/usr/src/sys/ufs/lfs/lfs_extern.h
index 9ffabc7..5394732 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_extern.h
+++ b/usr/src/sys/ufs/lfs/lfs_extern.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_extern.h        8.3 (Berkeley) %G%
+ *     @(#)lfs_extern.h        8.4 (Berkeley) %G%

  */
 
 struct fid;
  */
 
 struct fid;


@@ -19,10 +19,10 @@ struct mbuf;
 
 __BEGIN_DECLS
 u_long  cksum __P((void *, size_t));                           /* XXX */
 
 __BEGIN_DECLS
 u_long  cksum __P((void *, size_t));                           /* XXX */

-int     lfs_balloc __P((struct vnode *, u_long, daddr_t, struct buf **));
+int     lfs_balloc __P((struct vnode *, u_long, ufs_daddr_t, struct buf **));

 int     lfs_blkatoff __P((struct vop_blkatoff_args *));
 int     lfs_bwrite __P((struct vop_bwrite_args *));
 int     lfs_blkatoff __P((struct vop_blkatoff_args *));
 int     lfs_bwrite __P((struct vop_bwrite_args *));

-int     lfs_check __P((struct vnode *, daddr_t));
+int     lfs_check __P((struct vnode *, ufs_daddr_t));

 int     lfs_close __P((struct vop_close_args *));
 int     lfs_create __P((struct vop_create_args *));
 int     lfs_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
 int     lfs_close __P((struct vop_close_args *));
 int     lfs_create __P((struct vop_create_args *));
 int     lfs_fhtovp __P((struct mount *, struct fid *, struct mbuf *,


@@ -42,7 +42,7 @@ int    lfs_mount __P((struct mount *,
            char *, caddr_t, struct nameidata *, struct proc *));
 int     lfs_mountroot __P((void));
 struct buf *
            char *, caddr_t, struct nameidata *, struct proc *));
 int     lfs_mountroot __P((void));
 struct buf *

-        lfs_newbuf __P((struct vnode *, daddr_t, size_t));
+        lfs_newbuf __P((struct vnode *, ufs_daddr_t, size_t));

 int     lfs_read __P((struct vop_read_args *));
 int     lfs_reclaim __P((struct vop_reclaim_args *));
 int     lfs_remove __P((struct vop_remove_args *));
 int     lfs_read __P((struct vop_read_args *));
 int     lfs_reclaim __P((struct vop_reclaim_args *));
 int     lfs_remove __P((struct vop_remove_args *));

diff --git a/usr/src/sys/ufs/lfs/lfs_inode.c b/usr/src/sys/ufs/lfs/lfs_inode.c
index 51e977f..90ba866 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_inode.c
+++ b/usr/src/sys/ufs/lfs/lfs_inode.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_inode.c 8.6 (Berkeley) %G%
+ *     @(#)lfs_inode.c 8.7 (Berkeley) %G%

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


@@ -127,7 +127,7 @@ lfs_truncate(ap)
 {
        register struct indir *inp;
        register int i;
 {
        register struct indir *inp;
        register int i;

-       register daddr_t *daddrp;
+       register ufs_daddr_t *daddrp;

        register struct vnode *vp = ap->a_vp;
        off_t length = ap->a_length;
        struct buf *bp, *sup_bp;
        register struct vnode *vp = ap->a_vp;
        off_t length = ap->a_length;
        struct buf *bp, *sup_bp;


@@ -137,7 +137,7 @@ lfs_truncate(ap)
        struct lfs *fs;
        struct indir a[NIADDR + 2], a_end[NIADDR + 2];
        SEGUSE *sup;
        struct lfs *fs;
        struct indir a[NIADDR + 2], a_end[NIADDR + 2];
        SEGUSE *sup;

-       daddr_t daddr, lastblock, lbn, olastblock;
+       ufs_daddr_t daddr, lastblock, lbn, olastblock;

        long off, a_released, blocksreleased, i_released;
        int e1, e2, depth, lastseg, num, offset, seg, size;
 
        long off, a_released, blocksreleased, i_released;
        int e1, e2, depth, lastseg, num, offset, seg, size;
 


@@ -235,7 +235,8 @@ lfs_truncate(ap)
                                    inp->in_lbn, fs->lfs_bsize, NOCRED, &bp))
                                        panic("lfs_truncate: bread bno %d",
                                            inp->in_lbn);
                                    inp->in_lbn, fs->lfs_bsize, NOCRED, &bp))
                                        panic("lfs_truncate: bread bno %d",
                                            inp->in_lbn);

-                               daddrp = (daddr_t *)bp->b_data + inp->in_off;
+                               daddrp = (ufs_daddr_t *)bp->b_data +
+                                   inp->in_off;

                                for (i = inp->in_off;
                                    i++ <= a_end[depth].in_off;) {
                                        daddr = *daddrp++;
                                for (i = inp->in_off;
                                    i++ <= a_end[depth].in_off;) {
                                        daddr = *daddrp++;


@@ -245,9 +246,9 @@ lfs_truncate(ap)
                                if (inp->in_off == 0)
                                        brelse (bp);
                                else {
                                if (inp->in_off == 0)
                                        brelse (bp);
                                else {

-                                       bzero((daddr_t *)bp->b_data +
+                                       bzero((ufs_daddr_t *)bp->b_data +

                                            inp->in_off, fs->lfs_bsize - 
                                            inp->in_off, fs->lfs_bsize - 

-                                           inp->in_off * sizeof(daddr_t));
+                                           inp->in_off * sizeof(ufs_daddr_t));

                                        if (e1 = VOP_BWRITE(bp)) 
                                                return (e1);
                                }
                                        if (e1 = VOP_BWRITE(bp)) 
                                                return (e1);
                                }

diff --git a/usr/src/sys/ufs/lfs/lfs_segment.c b/usr/src/sys/ufs/lfs/lfs_segment.c
index d0cb163..754842a 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_segment.c
+++ b/usr/src/sys/ufs/lfs/lfs_segment.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_segment.c       8.6 (Berkeley) %G%
+ *     @(#)lfs_segment.c       8.7 (Berkeley) %G%

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


@@ -48,13 +48,13 @@ void         lfs_callback __P((struct buf *));
 void    lfs_gather __P((struct lfs *, struct segment *,
             struct vnode *, int (*) __P((struct lfs *, struct buf *))));
 int     lfs_gatherblock __P((struct segment *, struct buf *, int *));
 void    lfs_gather __P((struct lfs *, struct segment *,
             struct vnode *, int (*) __P((struct lfs *, struct buf *))));
 int     lfs_gatherblock __P((struct segment *, struct buf *, int *));

-void    lfs_iset __P((struct inode *, daddr_t, time_t));
+void    lfs_iset __P((struct inode *, ufs_daddr_t, time_t));

 int     lfs_match_data __P((struct lfs *, struct buf *));
 int     lfs_match_dindir __P((struct lfs *, struct buf *));
 int     lfs_match_indir __P((struct lfs *, struct buf *));
 int     lfs_match_tindir __P((struct lfs *, struct buf *));
 void    lfs_newseg __P((struct lfs *));
 int     lfs_match_data __P((struct lfs *, struct buf *));
 int     lfs_match_dindir __P((struct lfs *, struct buf *));
 int     lfs_match_indir __P((struct lfs *, struct buf *));
 int     lfs_match_tindir __P((struct lfs *, struct buf *));
 void    lfs_newseg __P((struct lfs *));

-void    lfs_shellsort __P((struct buf **, daddr_t *, register int));
+void    lfs_shellsort __P((struct buf **, ufs_daddr_t *, register int));

 void    lfs_supercallback __P((struct buf *));
 void    lfs_updatemeta __P((struct segment *));
 int     lfs_vref __P((struct vnode *));
 void    lfs_supercallback __P((struct buf *));
 void    lfs_updatemeta __P((struct segment *));
 int     lfs_vref __P((struct vnode *));


@@ -187,7 +187,7 @@ lfs_segwrite(mp, flags)
        struct segment *sp;
        struct vnode *vp;
        SEGUSE *segusep;
        struct segment *sp;
        struct vnode *vp;
        SEGUSE *segusep;

-       daddr_t ibno;
+       ufs_daddr_t ibno;

        CLEANERINFO *cip;
        int clean, do_ckp, error, i;
 
        CLEANERINFO *cip;
        int clean, do_ckp, error, i;
 


@@ -305,7 +305,7 @@ lfs_writefile(fs, sp, vp)
            sp->sum_bytes_left < sizeof(struct finfo))
                (void) lfs_writeseg(fs, sp);
 
            sp->sum_bytes_left < sizeof(struct finfo))
                (void) lfs_writeseg(fs, sp);
 

-       sp->sum_bytes_left -= sizeof(struct finfo) - sizeof(daddr_t);
+       sp->sum_bytes_left -= sizeof(struct finfo) - sizeof(ufs_daddr_t);

        ++((SEGSUM *)(sp->segsum))->ss_nfinfo;
 
        fip = sp->fip;
        ++((SEGSUM *)(sp->segsum))->ss_nfinfo;
 
        fip = sp->fip;


@@ -331,10 +331,10 @@ lfs_writefile(fs, sp, vp)
        if (fip->fi_nblocks != 0) {
                sp->fip =
                    (struct finfo *)((caddr_t)fip + sizeof(struct finfo) +
        if (fip->fi_nblocks != 0) {
                sp->fip =
                    (struct finfo *)((caddr_t)fip + sizeof(struct finfo) +

-                   sizeof(daddr_t) * (fip->fi_nblocks - 1));
+                   sizeof(ufs_daddr_t) * (fip->fi_nblocks - 1));

                sp->start_lbp = &sp->fip->fi_blocks[0];
        } else {
                sp->start_lbp = &sp->fip->fi_blocks[0];
        } else {

-               sp->sum_bytes_left += sizeof(struct finfo) - sizeof(daddr_t);
+               sp->sum_bytes_left += sizeof(struct finfo) - sizeof(ufs_daddr_t);

                --((SEGSUM *)(sp->segsum))->ss_nfinfo;
        }
 }
                --((SEGSUM *)(sp->segsum))->ss_nfinfo;
        }
 }


@@ -348,7 +348,7 @@ lfs_writeinode(fs, sp, ip)
        struct buf *bp, *ibp;
        IFILE *ifp;
        SEGUSE *sup;
        struct buf *bp, *ibp;
        IFILE *ifp;
        SEGUSE *sup;

-       daddr_t daddr;
+       ufs_daddr_t daddr;

        ino_t ino;
        int error, i, ndx;
        int redo_ifile = 0;
        ino_t ino;
        int error, i, ndx;
        int redo_ifile = 0;


@@ -360,7 +360,7 @@ lfs_writeinode(fs, sp, ip)
        if (sp->ibp == NULL) {
                /* Allocate a new segment if necessary. */
                if (sp->seg_bytes_left < fs->lfs_bsize ||
        if (sp->ibp == NULL) {
                /* Allocate a new segment if necessary. */
                if (sp->seg_bytes_left < fs->lfs_bsize ||

-                   sp->sum_bytes_left < sizeof(daddr_t))
+                   sp->sum_bytes_left < sizeof(ufs_daddr_t))

                        (void) lfs_writeseg(fs, sp);
 
                /* Get next inode block. */
                        (void) lfs_writeseg(fs, sp);
 
                /* Get next inode block. */


@@ -376,10 +376,10 @@ lfs_writeinode(fs, sp, ip)
                fs->lfs_avail -= fsbtodb(fs, 1);
                /* Set remaining space counters. */
                sp->seg_bytes_left -= fs->lfs_bsize;
                fs->lfs_avail -= fsbtodb(fs, 1);
                /* Set remaining space counters. */
                sp->seg_bytes_left -= fs->lfs_bsize;

-               sp->sum_bytes_left -= sizeof(daddr_t);
-               ndx = LFS_SUMMARY_SIZE / sizeof(daddr_t) -
+               sp->sum_bytes_left -= sizeof(ufs_daddr_t);
+               ndx = LFS_SUMMARY_SIZE / sizeof(ufs_daddr_t) -

                    sp->ninodes / INOPB(fs) - 1;
                    sp->ninodes / INOPB(fs) - 1;

-               ((daddr_t *)(sp->segsum))[ndx] = daddr;
+               ((ufs_daddr_t *)(sp->segsum))[ndx] = daddr;

        }
 
        /* Update the inode times and copy the inode onto the inode page. */
        }
 
        /* Update the inode times and copy the inode onto the inode page. */


@@ -452,7 +452,7 @@ lfs_gatherblock(sp, bp, sptr)
                panic ("lfs_gatherblock: Null vp in segment");
 #endif
        fs = sp->fs;
                panic ("lfs_gatherblock: Null vp in segment");
 #endif
        fs = sp->fs;

-       if (sp->sum_bytes_left < sizeof(daddr_t) ||
+       if (sp->sum_bytes_left < sizeof(ufs_daddr_t) ||

            sp->seg_bytes_left < fs->lfs_bsize) {
                if (sptr)
                        splx(*sptr);
            sp->seg_bytes_left < fs->lfs_bsize) {
                if (sptr)
                        splx(*sptr);


@@ -466,7 +466,7 @@ lfs_gatherblock(sp, bp, sptr)
                /* Add the current file to the segment summary. */
                ++((SEGSUM *)(sp->segsum))->ss_nfinfo;
                sp->sum_bytes_left -= 
                /* Add the current file to the segment summary. */
                ++((SEGSUM *)(sp->segsum))->ss_nfinfo;
                sp->sum_bytes_left -= 

-                   sizeof(struct finfo) - sizeof(daddr_t);
+                   sizeof(struct finfo) - sizeof(ufs_daddr_t);

 
                if (sptr)
                        *sptr = splbio();
 
                if (sptr)
                        *sptr = splbio();


@@ -478,7 +478,7 @@ lfs_gatherblock(sp, bp, sptr)
        *sp->cbpp++ = bp;
        sp->fip->fi_blocks[sp->fip->fi_nblocks++] = bp->b_lblkno;
 
        *sp->cbpp++ = bp;
        sp->fip->fi_blocks[sp->fip->fi_nblocks++] = bp->b_lblkno;
 

-       sp->sum_bytes_left -= sizeof(daddr_t);
+       sp->sum_bytes_left -= sizeof(ufs_daddr_t);

        sp->seg_bytes_left -= fs->lfs_bsize;
        return(0);
 }
        sp->seg_bytes_left -= fs->lfs_bsize;
        return(0);
 }


@@ -528,7 +528,7 @@ lfs_updatemeta(sp)
        struct vnode *vp;
        struct indir a[NIADDR + 2], *ap;
        struct inode *ip;
        struct vnode *vp;
        struct indir a[NIADDR + 2], *ap;
        struct inode *ip;

-       daddr_t daddr, lbn, off;
+       ufs_daddr_t daddr, lbn, off;

        int db_per_fsb, error, i, nblocks, num;
 
        vp = sp->vp;
        int db_per_fsb, error, i, nblocks, num;
 
        vp = sp->vp;


@@ -575,7 +575,7 @@ printf ("Updatemeta allocating indirect block: shouldn't happen\n");
                                ip->i_blocks += btodb(fs->lfs_bsize);
                                fs->lfs_bfree -= btodb(fs->lfs_bsize);
                        }
                                ip->i_blocks += btodb(fs->lfs_bsize);
                                fs->lfs_bfree -= btodb(fs->lfs_bsize);
                        }

-                       ((daddr_t *)bp->b_data)[ap->in_off] = off;
+                       ((ufs_daddr_t *)bp->b_data)[ap->in_off] = off;

                        VOP_BWRITE(bp);
                }
 
                        VOP_BWRITE(bp);
                }
 


@@ -966,7 +966,7 @@ lfs_match_tindir(fs, bp)
 struct buf *
 lfs_newbuf(vp, daddr, size)
        struct vnode *vp;
 struct buf *
 lfs_newbuf(vp, daddr, size)
        struct vnode *vp;

-       daddr_t daddr;
+       ufs_daddr_t daddr;

        size_t size;
 {
        struct buf *bp;
        size_t size;
 {
        struct buf *bp;


@@ -1033,7 +1033,7 @@ lfs_supercallback(bp)
 void
 lfs_shellsort(bp_array, lb_array, nmemb)
        struct buf **bp_array;
 void
 lfs_shellsort(bp_array, lb_array, nmemb)
        struct buf **bp_array;

-       daddr_t *lb_array;
+       ufs_daddr_t *lb_array;

        register int nmemb;
 {
        static int __rsshell_increments[] = { 4, 1, 0 };
        register int nmemb;
 {
        static int __rsshell_increments[] = { 4, 1, 0 };

diff --git a/usr/src/sys/ufs/lfs/lfs_subr.c b/usr/src/sys/ufs/lfs/lfs_subr.c
index 945cd90..e1b1d82 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_subr.c
+++ b/usr/src/sys/ufs/lfs/lfs_subr.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_subr.c  8.2 (Berkeley) %G%
+ *     @(#)lfs_subr.c  8.3 (Berkeley) %G%

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


@@ -37,7 +37,7 @@ lfs_blkatoff(ap)
        register struct lfs *fs;
        struct inode *ip;
        struct buf *bp;
        register struct lfs *fs;
        struct inode *ip;
        struct buf *bp;

-       daddr_t lbn;
+       ufs_daddr_t lbn;

        int bsize, error;
 
        ip = VTOI(ap->a_vp);
        int bsize, error;
 
        ip = VTOI(ap->a_vp);


@@ -83,7 +83,8 @@ lfs_seglock(fs, flags)
 
        sp = fs->lfs_sp = malloc(sizeof(struct segment), M_SEGMENT, M_WAITOK);
        sp->bpp = malloc(((LFS_SUMMARY_SIZE - sizeof(SEGSUM)) /
 
        sp = fs->lfs_sp = malloc(sizeof(struct segment), M_SEGMENT, M_WAITOK);
        sp->bpp = malloc(((LFS_SUMMARY_SIZE - sizeof(SEGSUM)) /

-           sizeof(daddr_t) + 1) * sizeof(struct buf *), M_SEGMENT, M_WAITOK);
+           sizeof(ufs_daddr_t) + 1) * sizeof(struct buf *),
+           M_SEGMENT, M_WAITOK);

        sp->seg_flags = flags;
        sp->vp = NULL;
        (void) lfs_initseg(fs);
        sp->seg_flags = flags;
        sp->vp = NULL;
        (void) lfs_initseg(fs);

diff --git a/usr/src/sys/ufs/lfs/lfs_syscalls.c b/usr/src/sys/ufs/lfs/lfs_syscalls.c
index feca060..34c191c 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_syscalls.c
+++ b/usr/src/sys/ufs/lfs/lfs_syscalls.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_syscalls.c      8.6 (Berkeley) %G%
+ *     @(#)lfs_syscalls.c      8.7 (Berkeley) %G%

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


@@ -73,7 +73,7 @@ lfs_markv(p, uap, retval)
        fsid_t fsid;
        void *start;
        ino_t lastino;
        fsid_t fsid;
        void *start;
        ino_t lastino;

-       daddr_t b_daddr, v_daddr;
+       ufs_daddr_t b_daddr, v_daddr;

        u_long bsize;
        int cnt, error;
 
        u_long bsize;
        int cnt, error;
 


@@ -109,7 +109,7 @@ lfs_markv(p, uap, retval)
                                if (sp->fip->fi_nblocks == 0) {
                                        DEC_FINFO(sp);
                                        sp->sum_bytes_left +=
                                if (sp->fip->fi_nblocks == 0) {
                                        DEC_FINFO(sp);
                                        sp->sum_bytes_left +=

-                                           sizeof(FINFO) - sizeof(daddr_t);
+                                           sizeof(FINFO) - sizeof(ufs_daddr_t);

                                } else {
                                        lfs_updatemeta(sp);
                                        BUMP_FIP(sp);
                                } else {
                                        lfs_updatemeta(sp);
                                        BUMP_FIP(sp);


@@ -121,7 +121,7 @@ lfs_markv(p, uap, retval)
 
                        /* Start a new file */
                        CHECK_SEG(sizeof(FINFO));
 
                        /* Start a new file */
                        CHECK_SEG(sizeof(FINFO));

-                       sp->sum_bytes_left -= sizeof(FINFO) - sizeof(daddr_t);
+                       sp->sum_bytes_left -= sizeof(FINFO) - sizeof(ufs_daddr_t);

                        INC_FINFO(sp);
                        sp->start_lbp = &sp->fip->fi_blocks[0];
                        sp->vp = NULL;
                        INC_FINFO(sp);
                        sp->start_lbp = &sp->fip->fi_blocks[0];
                        sp->vp = NULL;


@@ -187,7 +187,7 @@ lfs_markv(p, uap, retval)
                if (sp->fip->fi_nblocks == 0) {
                        DEC_FINFO(sp);
                        sp->sum_bytes_left +=
                if (sp->fip->fi_nblocks == 0) {
                        DEC_FINFO(sp);
                        sp->sum_bytes_left +=

-                           sizeof(FINFO) - sizeof(daddr_t);
+                           sizeof(FINFO) - sizeof(ufs_daddr_t);

                } else
                        lfs_updatemeta(sp);
 
                } else
                        lfs_updatemeta(sp);
 


@@ -244,7 +244,7 @@ lfs_bmapv(p, uap, retval)
        struct vnode *vp;
        fsid_t fsid;
        void *start;
        struct vnode *vp;
        fsid_t fsid;
        void *start;

-       daddr_t daddr;
+       ufs_daddr_t daddr;

        int cnt, error, step;
 
        if (error = suser(p->p_ucred, &p->p_acflag))
        int cnt, error, step;
 
        if (error = suser(p->p_ucred, &p->p_acflag))


@@ -415,7 +415,7 @@ int
 lfs_fastvget(mp, ino, daddr, vpp, dinp)
        struct mount *mp;
        ino_t ino;
 lfs_fastvget(mp, ino, daddr, vpp, dinp)
        struct mount *mp;
        ino_t ino;

-       daddr_t daddr;
+       ufs_daddr_t daddr;

        struct vnode **vpp;
        struct dinode *dinp;
 {
        struct vnode **vpp;
        struct dinode *dinp;
 {

diff --git a/usr/src/sys/ufs/lfs/lfs_vfsops.c b/usr/src/sys/ufs/lfs/lfs_vfsops.c
index aa5d221..fbd9ea2 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_vfsops.c
+++ b/usr/src/sys/ufs/lfs/lfs_vfsops.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_vfsops.c        8.10 (Berkeley) %G%
+ *     @(#)lfs_vfsops.c        8.11 (Berkeley) %G%

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


@@ -416,7 +416,7 @@ lfs_vget(mp, ino, vpp)
        struct ifile *ifp;
        struct vnode *vp;
        struct ufsmount *ump;
        struct ifile *ifp;
        struct vnode *vp;
        struct ufsmount *ump;

-       daddr_t daddr;
+       ufs_daddr_t daddr;

        dev_t dev;
        int error;
 
        dev_t dev;
        int error;