diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2003-08-25 23:36:47 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2003-08-25 23:36:47 +0000 |
| commit | 7ff56c2f0d3e92c07cae200e1da2be696fdf1ff6 (patch) | |
| tree | a7cbd44dee033f3b744b95d51ad4b3463f675486 /sys | |
| parent | ea03fe96dd2a572acb0e879c2586bba89034c050 (diff) | |
rename struct dinode to ufs1_dinode. clears the namespace and makes
way for some future work. no function changes yet.
help testing otto@ and markus@
Diffstat (limited to 'sys')
4 files changed, 12 insertions, 12 deletions
diff --git a/sys/arch/mvme68k/stand/installboot/installboot.c b/sys/arch/mvme68k/stand/installboot/installboot.c index 16b114994f4..3db8a4edc0e 100644 --- a/sys/arch/mvme68k/stand/installboot/installboot.c +++ b/sys/arch/mvme68k/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.9 2003/08/16 17:46:28 deraadt Exp $ */ +/* $OpenBSD: installboot.c,v 1.10 2003/08/25 23:36:46 tedu Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -288,7 +288,7 @@ loadblocknums(char *boot, int devfd) struct fs *fs; char *buf; daddr_t blk, *ap; - struct dinode *ip; + struct ufs1_dinode *ip; int ndb; /* @@ -336,7 +336,7 @@ loadblocknums(char *boot, int devfd) blk = fsbtodb(fs, ino_to_fsba(fs, statbuf.st_ino)); devread(devfd, buf, 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/arch/mvme88k/stand/installboot/installboot.c b/sys/arch/mvme88k/stand/installboot/installboot.c index 760a5d32ee8..3f10148edf6 100644 --- a/sys/arch/mvme88k/stand/installboot/installboot.c +++ b/sys/arch/mvme88k/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.7 2003/06/01 17:00:37 deraadt Exp $ */ +/* $OpenBSD: installboot.c,v 1.8 2003/08/25 23:36:46 tedu Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -297,7 +297,7 @@ int devfd; struct fs *fs; char *buf; daddr_t blk, *ap; - struct dinode *ip; + struct ufs1_dinode *ip; int ndb; /* @@ -345,7 +345,7 @@ int devfd; blk = fsbtodb(fs, ino_to_fsba(fs, statbuf.st_ino)); devread(devfd, buf, 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/arch/sparc/stand/installboot/installboot.c b/sys/arch/sparc/stand/installboot/installboot.c index c8ff310f55e..4ba461e7391 100644 --- a/sys/arch/sparc/stand/installboot/installboot.c +++ b/sys/arch/sparc/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.3 2002/03/14 01:26:44 millert Exp $ */ +/* $OpenBSD: installboot.c,v 1.4 2003/08/25 23:36:46 tedu Exp $ */ /* $NetBSD: installboot.c,v 1.1 1997/06/01 03:39:45 mrg Exp $ */ /* @@ -342,7 +342,7 @@ int devfd; struct fs *fs; char *buf; daddr_t blk, *ap; - struct dinode *ip; + struct ufs1_dinode *ip; int ndb; /* @@ -398,7 +398,7 @@ int devfd; blk = fsbtodb(fs, ino_to_fsba(fs, statbuf.st_ino)); devread(devfd, buf, 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); /* * Register filesystem block size. diff --git a/sys/arch/sparc64/stand/installboot/installboot.c b/sys/arch/sparc64/stand/installboot/installboot.c index 1a028498edb..61470f541e4 100644 --- a/sys/arch/sparc64/stand/installboot/installboot.c +++ b/sys/arch/sparc64/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: installboot.c,v 1.3 2002/03/14 01:26:46 millert Exp $ */ +/* $OpenBSD: installboot.c,v 1.4 2003/08/25 23:36:46 tedu Exp $ */ /* $NetBSD: installboot.c,v 1.8 2001/02/19 22:48:59 cgd Exp $ */ /*- @@ -369,7 +369,7 @@ int devfd; struct fs *fs; char *buf; daddr_t blk, *ap; - struct dinode *ip; + struct ufs1_dinode *ip; int ndb; /* @@ -405,7 +405,7 @@ int devfd; blk = fsbtodb(fs, ino_to_fsba(fs, statbuf.st_ino)); devread(devfd, buf, 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); /* * Register filesystem block size. |