diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/alpha/stand/installboot.c | 6 | ||||
| -rw-r--r-- | sys/arch/i386/stand/installboot/installboot.c | 6 | ||||
| -rw-r--r-- | sys/lib/libsa/ufs.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/alpha/stand/installboot.c b/sys/arch/alpha/stand/installboot.c index b154692528e..a25e8eb4940 100644 --- a/sys/arch/alpha/stand/installboot.c +++ b/sys/arch/alpha/stand/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.11 2002/03/14 01:26:27 millert Exp $ */ +/* $OpenBSD: installboot.c,v 1.12 2003/08/25 23:27:43 tedu Exp $ */ /* $NetBSD: installboot.c,v 1.2 1997/04/06 08:41:12 cgd Exp $ */ /* @@ -339,7 +339,7 @@ loadblocknums(boot, devfd, partoffset) struct fs *fs; char *buf; daddr_t blk, *ap; - struct dinode *ip; + struct ufs1_dinode *ip; int ndb; int32_t cksum; @@ -401,7 +401,7 @@ loadblocknums(boot, devfd, partoffset) blk = fsbtodb(fs, ino_to_fsba(fs, statbuf.st_ino)); devread(devfd, buf, blk + partoffset, fs->fs_bsize, "inode"); - ip = (struct dinode *)(buf) + ino_to_fsbo(fs, statbuf.st_ino); + ip = (struct ufs1_dinode *)(buf) + ino_to_fsbo(fs, statbuf.st_ino); /* * Register filesystem block size. diff --git a/sys/arch/i386/stand/installboot/installboot.c b/sys/arch/i386/stand/installboot/installboot.c index 2ea0d8ec856..fa9b0e1f069 100644 --- a/sys/arch/i386/stand/installboot/installboot.c +++ b/sys/arch/i386/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.40 2003/08/15 21:17:27 deraadt Exp $ */ +/* $OpenBSD: installboot.c,v 1.41 2003/08/25 23:27:43 tedu Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -378,7 +378,7 @@ loadblocknums(char *boot, int devfd, struct disklabel *dl) struct fs *fs; char *buf; daddr_t blk, *ap; - struct dinode *ip; + struct ufs1_dinode *ip; int ndb; u_int8_t *bt; int mib[4]; @@ -454,7 +454,7 @@ loadblocknums(char *boot, int devfd, struct disklabel *dl) blk = fsbtodb(fs, ino_to_fsba(fs, statbuf.st_ino)); devread(devfd, buf, pl->p_offset + blk, fs->fs_bsize, "inode"); - ip = (struct dinode *)(buf) + ino_to_fsbo(fs, statbuf.st_ino); + ip = (struct ufs1_dinode *)(buf) + ino_to_fsbo(fs, statbuf.st_ino); /* * Have the inode. Figure out how many blocks we need. diff --git a/sys/lib/libsa/ufs.c b/sys/lib/libsa/ufs.c index 196b2f2f53c..863dcd1489e 100644 --- a/sys/lib/libsa/ufs.c +++ b/sys/lib/libsa/ufs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs.c,v 1.16 2003/08/11 06:23:09 deraadt Exp $ */ +/* $OpenBSD: ufs.c,v 1.17 2003/08/25 23:27:44 tedu Exp $ */ /* $NetBSD: ufs.c,v 1.16 1996/09/30 16:01:22 ws Exp $ */ /*- @@ -80,7 +80,7 @@ struct file { off_t f_seekp; /* seek pointer */ struct fs *f_fs; /* pointer to super-block */ - struct dinode f_di; /* copy of on-disk inode */ + struct ufs1_dinode f_di; /* copy of on-disk inode */ int f_nindir[NIADDR]; /* number of blocks mapped by indirect block at level i */ @@ -130,9 +130,9 @@ read_inode(ino_t inumber, struct open_file *f) } { - struct dinode *dp; + struct ufs1_dinode *dp; - dp = (struct dinode *)buf; + dp = (struct ufs1_dinode *)buf; fp->f_di = dp[ino_to_fsbo(fs, inumber)]; } |