diff options
Diffstat (limited to 'sys/ufs/ffs/softdep.h')
-rw-r--r-- | sys/ufs/ffs/softdep.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/ufs/ffs/softdep.h b/sys/ufs/ffs/softdep.h index 187dbd22ac3..3f4bd355f00 100644 --- a/sys/ufs/ffs/softdep.h +++ b/sys/ufs/ffs/softdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: softdep.h,v 1.14 2007/06/01 20:23:26 pedro Exp $ */ +/* $OpenBSD: softdep.h,v 1.15 2008/01/05 19:49:26 otto Exp $ */ /* * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved. @@ -280,7 +280,7 @@ struct inodedep { struct newblk { LIST_ENTRY(newblk) nb_hash; /* hashed lookup */ struct fs *nb_fs; /* associated filesystem */ - daddr_t nb_newblkno; /* allocated block number */ + daddr64_t nb_newblkno; /* allocated block number */ int nb_state; /* state of bitmap dependency */ LIST_ENTRY(newblk) nb_deps; /* bmsafemap's list of newblk's */ struct bmsafemap *nb_bmsafemap; /* associated bmsafemap */ @@ -337,8 +337,8 @@ struct allocdirect { # define ad_state ad_list.wk_state /* block pointer state */ TAILQ_ENTRY(allocdirect) ad_next; /* inodedep's list of allocdirect's */ 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 */ + daddr64_t ad_newblkno; /* new value of block pointer */ + daddr64_t ad_oldblkno; /* old value of block pointer */ long ad_newsize; /* size of new block */ long ad_oldsize; /* size of old block */ LIST_ENTRY(allocdirect) ad_deps; /* bmsafemap's list of allocdirect's */ @@ -392,8 +392,8 @@ struct allocindir { # define ai_state ai_list.wk_state /* indirect block pointer state */ LIST_ENTRY(allocindir) ai_next; /* indirdep's list of allocindir's */ int ai_offset; /* pointer offset in indirect block */ - daddr_t ai_newblkno; /* new block pointer value */ - daddr_t ai_oldblkno; /* old block pointer value */ + daddr64_t ai_newblkno; /* new block pointer value */ + daddr64_t ai_oldblkno; /* old block pointer value */ struct freefrag *ai_freefrag; /* block to be freed when complete */ struct indirdep *ai_indirdep; /* address of associated indirdep */ LIST_ENTRY(allocindir) ai_deps; /* bmsafemap's list of allocindir's */ @@ -415,7 +415,7 @@ struct freefrag { # define ff_state ff_list.wk_state /* owning user; should be uid_t */ struct vnode *ff_devvp; /* filesystem device vnode */ struct mount *ff_mnt; /* associated mount point */ - daddr_t ff_blkno; /* fragment physical block number */ + daddr64_t ff_blkno; /* fragment physical block number */ long ff_fragsize; /* size of fragment being deleted */ ino_t ff_inum; /* owning inode number */ }; @@ -436,8 +436,8 @@ struct freeblks { off_t fb_newsize; /* new file size */ int fb_chkcnt; /* used to check cnt of blks released */ uid_t fb_uid; /* uid of previous owner of blocks */ - daddr_t fb_dblks[NDADDR]; /* direct blk ptrs to deallocate */ - daddr_t fb_iblks[NIADDR]; /* indirect blk ptrs to deallocate */ + daddr64_t fb_dblks[NDADDR]; /* direct blk ptrs to deallocate */ + daddr64_t fb_iblks[NIADDR]; /* indirect blk ptrs to deallocate */ }; /* |