diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-06-11 16:42:20 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-06-11 16:42:20 +0000 |
| commit | 6b46236c83f9aa5b9cd59b466eeba348ee23825a (patch) | |
| tree | ef7eca8601ed03d00b5a9a53b3355f66ed478486 /sys/ufs/ffs/ffs_vfsops.c | |
| parent | cc20036a151815396b8c4285e8b3b56f0172f1d5 (diff) | |
final removal of daddr64_t. daddr_t has been 64 bit for a long enough
test period; i think 3 years ago the last bugs fell out.
ok otto beck others
Diffstat (limited to 'sys/ufs/ffs/ffs_vfsops.c')
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index d7dfe29ea7b..f5b85dfce2c 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vfsops.c,v 1.137 2013/05/30 19:19:09 guenther Exp $ */ +/* $OpenBSD: ffs_vfsops.c,v 1.138 2013/06/11 16:42:18 deraadt Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */ /* @@ -70,7 +70,7 @@ int ffs_reload_vnode(struct vnode *, void *); int ffs_sync_vnode(struct vnode *, void *); int ffs_validate(struct fs *); -void ffs1_compat_read(struct fs *, struct ufsmount *, daddr64_t); +void ffs1_compat_read(struct fs *, struct ufsmount *, daddr_t); void ffs1_compat_write(struct fs *, struct ufsmount *); const struct vfsops ffs_vfsops = { @@ -663,7 +663,7 @@ ffs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p) struct fs *fs; dev_t dev; caddr_t space; - daddr64_t sbloc; + daddr_t sbloc; int error, i, blks, size, ronly; int32_t *lp; size_t strsize; @@ -953,7 +953,7 @@ ffs_oldfscompat(struct fs *fs) * Auxiliary function for reading FFS1 super blocks. */ void -ffs1_compat_read(struct fs *fs, struct ufsmount *ump, daddr64_t sbloc) +ffs1_compat_read(struct fs *fs, struct ufsmount *ump, daddr_t sbloc) { if (fs->fs_magic == FS_UFS2_MAGIC) return; /* UFS2 */ |