Nuke 'ufs_lbn_t', okay otto@ deraadt@ krw@ beck@

6 files changed, 25 insertions, 28 deletions

diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index e7c239b8ad5..02e0a9e31d0 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_alloc.c,v 1.75 2007/06/01 18:54:27 pedro Exp $	*/
+/*	$OpenBSD: ffs_alloc.c,v 1.76 2007/06/01 20:23:25 pedro Exp $	*/
 /*	$NetBSD: ffs_alloc.c,v 1.11 1996/05/11 18:27:09 mycroft Exp $	*/
 
 /*
@@ -583,7 +583,7 @@ ffs2_reallocblks(void *v)
 	daddr64_t *bap, *sbap, *ebap = 0;
 	struct cluster_save *buflist;
 	struct ufsmount *ump;
-	ufs_lbn_t start_lbn, end_lbn;
+	daddr64_t start_lbn, end_lbn;
 	daddr64_t soff, newblk, blkno, pref;
 	struct indir start_ap[NIADDR + 1], end_ap[NIADDR + 1], *idp;
 	int i, len, start_lvl, end_lvl, ssize;
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index e27ff8d011d..8261377d334 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_extern.h,v 1.31 2007/06/01 18:54:27 pedro Exp $	*/
+/*	$OpenBSD: ffs_extern.h,v 1.32 2007/06/01 20:23:25 pedro Exp $	*/
 /*	$NetBSD: ffs_extern.h,v 1.4 1996/02/09 22:22:22 christos Exp $	*/
 
 /*
@@ -177,11 +177,11 @@ void  softdep_freefile(struct vnode *, ino_t, mode_t);
 void  softdep_setup_freeblocks(struct inode *, off_t);
 void  softdep_setup_inomapdep(struct buf *, struct inode *, ino_t);
 void  softdep_setup_blkmapdep(struct buf *, struct fs *, daddr_t);
-void  softdep_setup_allocdirect(struct inode *, ufs_lbn_t, daddr_t,
+void  softdep_setup_allocdirect(struct inode *, daddr64_t, daddr_t,
             daddr_t, long, long, struct buf *);
 void  softdep_setup_allocindir_meta(struct buf *, struct inode *,
             struct buf *, int, daddr_t);
-void  softdep_setup_allocindir_page(struct inode *, ufs_lbn_t,
+void  softdep_setup_allocindir_page(struct inode *, daddr64_t,
             struct buf *, int, daddr_t, daddr_t, struct buf *);
 void  softdep_fsync_mountdev(struct vnode *, int);
 int   softdep_sync_metadata(struct vop_fsync_args *);
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index ee078fb3d36..fa7678027f6 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_softdep.c,v 1.90 2007/06/01 18:54:27 pedro Exp $	*/
+/*	$OpenBSD: ffs_softdep.c,v 1.91 2007/06/01 20:23:26 pedro Exp $	*/
 
 /*
  * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -139,8 +139,7 @@ STATIC	struct dirrem *newdirrem(struct buf *, struct inode *,
 STATIC	void free_diradd(struct diradd *);
 STATIC	void free_allocindir(struct allocindir *, struct inodedep *);
 STATIC	void free_newdirblk(struct newdirblk *);
-STATIC	int indir_trunc(struct inode *, daddr_t, int, ufs_lbn_t,
-	    long *);
+STATIC	int indir_trunc(struct inode *, daddr_t, int, daddr64_t, long *);
 STATIC	void deallocate_dependencies(struct buf *, struct inodedep *);
 STATIC	void free_allocdirect(struct allocdirectlst *,
 	    struct allocdirect *, int);
@@ -160,8 +159,7 @@ STATIC	struct bmsafemap *bmsafemap_lookup(struct buf *);
 STATIC	int newblk_lookup(struct fs *, daddr_t, int,
 	    struct newblk **);
 STATIC	int inodedep_lookup(struct fs *, ino_t, int, struct inodedep **);
-STATIC	int pagedep_lookup(struct inode *, ufs_lbn_t, int,
-	    struct pagedep **);
+STATIC	int pagedep_lookup(struct inode *, daddr64_t, int, struct pagedep **);
 STATIC	void pause_timer(void *);
 STATIC	int request_cleanup(int, int);
 STATIC	int process_worklist_item(struct mount *, int);
@@ -991,7 +989,7 @@ STATIC struct sema pagedep_in_progress;
 STATIC int
 pagedep_lookup(ip, lbn, flags, pagedeppp)
 	struct inode *ip;
-	ufs_lbn_t lbn;
+	daddr64_t lbn;
 	int flags;
 	struct pagedep **pagedeppp;
 {
@@ -1440,7 +1438,7 @@ bmsafemap_lookup(bp)
 void 
 softdep_setup_allocdirect(ip, lbn, newblkno, oldblkno, newsize, oldsize, bp)
 	struct inode *ip;	/* inode to which block is being added */
-	ufs_lbn_t lbn;		/* block pointer within inode */
+	daddr64_t lbn;		/* block pointer within inode */
 	daddr_t newblkno;	/* disk block number being added */
 	daddr_t oldblkno;	/* previous block number, 0 unless frag */
 	long newsize;		/* size of new block */
@@ -1720,7 +1718,7 @@ newallocindir(ip, ptrno, newblkno, oldblkno)
 void
 softdep_setup_allocindir_page(ip, lbn, bp, ptrno, newblkno, oldblkno, nbp)
 	struct inode *ip;	/* inode for file being extended */
-	ufs_lbn_t lbn;		/* allocated block number within file */
+	daddr64_t lbn;		/* allocated block number within file */
 	struct buf *bp;		/* buffer with indirect blk referencing page */
 	int ptrno;		/* offset of pointer in indirect block */
 	daddr_t newblkno;	/* disk block number being added */
@@ -2399,7 +2397,7 @@ handle_workitem_freeblocks(freeblks)
 	int i, level, bsize;
 	long nblocks, blocksreleased = 0;
 	int error, allerror = 0;
-	ufs_lbn_t baselbns[NIADDR], tmpval;
+	daddr64_t baselbns[NIADDR], tmpval;
 
 	if (VFSTOUFS(freeblks->fb_mnt)->um_fstype == UM_UFS1)
 		tip.i_din1 = &di.di1;
@@ -2464,7 +2462,7 @@ indir_trunc(ip, dbn, level, lbn, countp)
 	struct inode *ip;
 	daddr_t dbn;
 	int level;
-	ufs_lbn_t lbn;
+	daddr64_t lbn;
 	long *countp;
 {
 	struct buf *bp;
@@ -2610,7 +2608,7 @@ softdep_setup_directory_add(bp, dp, diroffset, newinum, newdirbp, isnewblk)
 	int isnewblk;		/* entry is in a newly allocated block */
 {
 	int offset;		/* offset of new entry within directory block */
-	ufs_lbn_t lbn;		/* block in directory containing new entry */
+	daddr64_t lbn;		/* block in directory containing new entry */
 	struct fs *fs;
 	struct diradd *dap;
 	struct allocdirect *adp;
@@ -2758,7 +2756,7 @@ softdep_change_directoryentry_offset(dp, base, oldloc, newloc, entrysize)
 	int offset, oldoffset, newoffset;
 	struct pagedep *pagedep;
 	struct diradd *dap;
-	ufs_lbn_t lbn;
+	daddr64_t lbn;
 
 	ACQUIRE_LOCK(&lk);
 	lbn = lblkno(dp->i_fs, dp->i_offset);
@@ -2913,7 +2911,7 @@ newdirrem(bp, dp, ip, isrmdir, prevdirremp)
 	struct dirrem **prevdirremp; /* previously referenced inode, if any */
 {
 	int offset;
-	ufs_lbn_t lbn;
+	daddr64_t lbn;
 	struct diradd *dap;
 	struct dirrem *dirrem;
 	struct pagedep *pagedep;
@@ -3443,7 +3441,7 @@ initiate_write_inodeblock_ufs1(inodedep, bp)
 	struct ufs1_dinode *dp;
 	struct fs *fs;
 #ifdef DIAGNOSTIC
-	ufs_lbn_t prevlbn = 0;
+	daddr64_t prevlbn = 0;
 	int32_t d1, d2;
 #endif
 	int i, deplist;
@@ -4561,7 +4559,7 @@ softdep_fsync(vp)
 	struct proc *p = CURPROC;		/* XXX */
 	int error, flushparent;
 	ino_t parentino;
-	ufs_lbn_t lbn;
+	daddr64_t lbn;
 
 	ip = VTOI(vp);
 	fs = ip->i_fs;
diff --git a/sys/ufs/ffs/ffs_softdep_stub.c b/sys/ufs/ffs/ffs_softdep_stub.c
index 6af63587f45..166002f4bb9 100644
--- a/sys/ufs/ffs/ffs_softdep_stub.c
+++ b/sys/ufs/ffs/ffs_softdep_stub.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_softdep_stub.c,v 1.14 2006/06/21 10:01:10 mickey Exp $	*/
+/*	$OpenBSD: ffs_softdep_stub.c,v 1.15 2007/06/01 20:23:26 pedro Exp $	*/
 
 /*
  * Copyright 1998 Marshall Kirk McKusick. All Rights Reserved.
@@ -80,14 +80,14 @@ softdep_setup_blkmapdep(struct buf *bp, struct fs *fs, daddr_t newblkno)
 }
 
 void 
-softdep_setup_allocdirect(struct inode *ip, ufs_lbn_t lbn, daddr_t newblkno,
+softdep_setup_allocdirect(struct inode *ip, daddr64_t lbn, daddr_t newblkno,
     daddr_t oldblkno, long newsize, long oldsize, struct buf *bp)
 {
 	panic("softdep_setup_allocdirect called");
 }
 
 void
-softdep_setup_allocindir_page(struct inode *ip, ufs_lbn_t lbn, struct buf *bp,
+softdep_setup_allocindir_page(struct inode *ip, daddr64_t lbn, struct buf *bp,
     int ptrno, daddr_t newblkno, daddr_t oldblkno, struct buf *nbp)
 {
 	panic("softdep_setup_allocindir_page called");
diff --git a/sys/ufs/ffs/softdep.h b/sys/ufs/ffs/softdep.h
index 6aed25804c7..187dbd22ac3 100644
--- a/sys/ufs/ffs/softdep.h
+++ b/sys/ufs/ffs/softdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softdep.h,v 1.13 2006/10/16 15:51:26 tom Exp $	*/
+/*	$OpenBSD: softdep.h,v 1.14 2007/06/01 20:23:26 pedro Exp $	*/
 
 /*
  * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
@@ -192,7 +192,7 @@ struct pagedep {
 	LIST_ENTRY(pagedep) pd_hash;	/* hashed lookup */
 	struct	mount *pd_mnt;		/* associated mount point */
 	ino_t	pd_ino;			/* associated file */
-	ufs_lbn_t pd_lbn;		/* block within file */
+	daddr64_t pd_lbn;		/* block within file */
 	struct	dirremhd pd_dirremhd;	/* dirrem's waiting for page */
 	struct	diraddhd pd_diraddhd[DAHASHSZ]; /* diradd dir entry updates */
 	struct	diraddhd pd_pendinghd;	/* directory entries awaiting write */
@@ -336,7 +336,7 @@ struct allocdirect {
 	struct	worklist ad_list;	/* buffer holding block */
 #	define	ad_state ad_list.wk_state /* block pointer state */
 	TAILQ_ENTRY(allocdirect) ad_next; /* inodedep's list of allocdirect's */
-	ufs_lbn_t ad_lbn;		/* block within file */
+	daddr64_t ad_lbn;		/* block within file */
 	daddr_t ad_newblkno;		/* new value of block pointer */
 	daddr_t ad_oldblkno;		/* old value of block pointer */
 	long	ad_newsize;		/* size of new block */
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index fc2610f670d..18a4e79bc2e 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dinode.h,v 1.15 2007/06/01 19:26:05 deraadt Exp $	*/
+/*	$OpenBSD: dinode.h,v 1.16 2007/06/01 20:23:26 pedro Exp $	*/
 /*	$NetBSD: dinode.h,v 1.7 1995/06/15 23:22:48 cgd Exp $	*/
 
 /*
@@ -56,7 +56,6 @@
  */
 
 typedef int32_t ufs1_daddr_t;
-typedef int64_t ufs_lbn_t;
 
 #define	NXADDR	2			/* External addresses in inode */
 #define	NDADDR	12			/* Direct addresses in inode. */