diff options
Diffstat (limited to 'sys/ufs/ffs/ffs_softdep.c')
| -rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 03532af425d..6ea4622b326 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.43 2003/05/14 01:12:27 jason Exp $ */ +/* $OpenBSD: ffs_softdep.c,v 1.44 2003/05/26 18:33:17 tedu Exp $ */ /* * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved. * @@ -134,7 +134,7 @@ STATIC struct dirrem *newdirrem(struct buf *, struct inode *, struct inode *, int, struct dirrem **); STATIC void free_diradd(struct diradd *); STATIC void free_allocindir(struct allocindir *, struct inodedep *); -STATIC int indir_trunc(struct inode *, ufs_daddr_t, int, ufs_lbn_t, +STATIC int indir_trunc(struct inode *, daddr_t, int, ufs_lbn_t, long *); STATIC void deallocate_dependencies(struct buf *, struct inodedep *); STATIC void free_allocdirect(struct allocdirectlst *, @@ -145,14 +145,14 @@ STATIC void handle_workitem_freeblocks(struct freeblks *); STATIC void merge_inode_lists(struct inodedep *); STATIC void setup_allocindir_phase2(struct buf *, struct inode *, struct allocindir *); -STATIC struct allocindir *newallocindir(struct inode *, int, ufs_daddr_t, - ufs_daddr_t); +STATIC struct allocindir *newallocindir(struct inode *, int, daddr_t, + daddr_t); STATIC void handle_workitem_freefrag(struct freefrag *); -STATIC struct freefrag *newfreefrag(struct inode *, ufs_daddr_t, long); +STATIC struct freefrag *newfreefrag(struct inode *, daddr_t, long); STATIC void allocdirect_merge(struct allocdirectlst *, struct allocdirect *, struct allocdirect *); STATIC struct bmsafemap *bmsafemap_lookup(struct buf *); -STATIC int newblk_lookup(struct fs *, ufs_daddr_t, int, +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, @@ -1109,7 +1109,7 @@ STATIC struct sema newblk_in_progress; STATIC int newblk_lookup(fs, newblkno, flags, newblkpp) struct fs *fs; - ufs_daddr_t newblkno; + daddr_t newblkno; int flags; struct newblk **newblkpp; { @@ -1317,7 +1317,7 @@ void softdep_setup_blkmapdep(bp, fs, newblkno) struct buf *bp; /* buffer for cylgroup block with block map */ struct fs *fs; /* filesystem doing allocation */ - ufs_daddr_t newblkno; /* number of newly allocated block */ + daddr_t newblkno; /* number of newly allocated block */ { struct newblk *newblk; struct bmsafemap *bmsafemap; @@ -1402,8 +1402,8 @@ 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 */ - ufs_daddr_t newblkno; /* disk block number being added */ - ufs_daddr_t oldblkno; /* previous block number, 0 unless frag */ + daddr_t newblkno; /* disk block number being added */ + daddr_t oldblkno; /* previous block number, 0 unless frag */ long newsize; /* size of new block */ long oldsize; /* size of new block */ struct buf *bp; /* bp for allocated block */ @@ -1566,7 +1566,7 @@ allocdirect_merge(adphead, newadp, oldadp) STATIC struct freefrag * newfreefrag(ip, blkno, size) struct inode *ip; - ufs_daddr_t blkno; + daddr_t blkno; long size; { struct freefrag *freefrag; @@ -1640,8 +1640,8 @@ STATIC struct allocindir * newallocindir(ip, ptrno, newblkno, oldblkno) struct inode *ip; /* inode for file being extended */ int ptrno; /* offset of pointer in indirect block */ - ufs_daddr_t newblkno; /* disk block number being added */ - ufs_daddr_t oldblkno; /* previous block number, 0 if none */ + daddr_t newblkno; /* disk block number being added */ + daddr_t oldblkno; /* previous block number, 0 if none */ { struct allocindir *aip; @@ -1666,8 +1666,8 @@ softdep_setup_allocindir_page(ip, lbn, bp, ptrno, newblkno, oldblkno, nbp) ufs_lbn_t lbn; /* allocated block number within file */ struct buf *bp; /* buffer with indirect blk referencing page */ int ptrno; /* offset of pointer in indirect block */ - ufs_daddr_t newblkno; /* disk block number being added */ - ufs_daddr_t oldblkno; /* previous block number, 0 if none */ + daddr_t newblkno; /* disk block number being added */ + daddr_t oldblkno; /* previous block number, 0 if none */ struct buf *nbp; /* buffer holding allocated page */ { struct allocindir *aip; @@ -1704,7 +1704,7 @@ softdep_setup_allocindir_meta(nbp, ip, bp, ptrno, newblkno) struct inode *ip; /* inode for file being extended */ struct buf *bp; /* indirect block referencing allocated block */ int ptrno; /* offset of pointer in indirect block */ - ufs_daddr_t newblkno; /* disk block number being added */ + daddr_t newblkno; /* disk block number being added */ { struct allocindir *aip; @@ -1791,7 +1791,7 @@ setup_allocindir_phase2(bp, ip, aip) free_allocindir(oldaip, NULL); } LIST_INSERT_HEAD(&indirdep->ir_deplisthd, aip, ai_next); - ((ufs_daddr_t *)indirdep->ir_savebp->b_data) + ((daddr_t *)indirdep->ir_savebp->b_data) [aip->ai_offset] = aip->ai_oldblkno; FREE_LOCK(&lk); if (freefrag != NULL) @@ -2224,7 +2224,7 @@ handle_workitem_freeblocks(freeblks) struct freeblks *freeblks; { struct inode tip; - ufs_daddr_t bn; + daddr_t bn; struct fs *fs; int i, level, bsize; long nblocks, blocksreleased = 0; @@ -2287,14 +2287,14 @@ handle_workitem_freeblocks(freeblks) STATIC int indir_trunc(ip, dbn, level, lbn, countp) struct inode *ip; - ufs_daddr_t dbn; + daddr_t dbn; int level; ufs_lbn_t lbn; long *countp; { struct buf *bp; - ufs_daddr_t *bap; - ufs_daddr_t nb; + daddr_t *bap; + daddr_t nb; struct fs *fs; struct worklist *wk; struct indirdep *indirdep; @@ -2342,7 +2342,7 @@ indir_trunc(ip, dbn, level, lbn, countp) /* * Recursively free indirect blocks. */ - bap = (ufs_daddr_t *)bp->b_data; + bap = (daddr_t *)bp->b_data; nblocks = btodb(fs->fs_bsize); for (i = NINDIR(fs) - 1; i >= 0; i--) { if ((nb = bap[i]) == 0) @@ -3549,7 +3549,7 @@ handle_allocindir_partdone(aip) LIST_INSERT_HEAD(&indirdep->ir_donehd, aip, ai_next); return; } - ((ufs_daddr_t *)indirdep->ir_savebp->b_data)[aip->ai_offset] = + ((daddr_t *)indirdep->ir_savebp->b_data)[aip->ai_offset] = aip->ai_newblkno; LIST_REMOVE(aip, ai_next); if (aip->ai_freefrag != NULL) |