diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2003-08-25 23:26:56 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2003-08-25 23:26:56 +0000 |
| commit | d5eab1b5294489e6eb637cefae0a4efb77c56d22 (patch) | |
| tree | 41851a62be09fe3ad4bc9ac384e2747be6798862 /sys/ufs/ffs/ffs_vfsops.c | |
| parent | 5b53867b985832fa8149d573e7cdf488354c6795 (diff) | |
rename struct dinode to ufs1_dinode. clears the namespace and makes
way for some future work. no function changes yet.
few other little cleanups.
help testing otto@ and markus@
Diffstat (limited to 'sys/ufs/ffs/ffs_vfsops.c')
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index a5f771cb907..5881672e7d2 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.58 2003/08/14 07:46:40 mickey Exp $ */ +/* $OpenBSD: ffs_vfsops.c,v 1.59 2003/08/25 23:26:55 tedu Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */ /* @@ -483,7 +483,7 @@ ffs_reload_vnode(struct vnode *vp, void *args) vput(vp); return (error); } - ip->i_din.ffs_din = *((struct dinode *)bp->b_data + + ip->i_din1 = *((struct ufs1_dinode *)bp->b_data + ino_to_fsbo(fra->fs, ip->i_number)); ip->i_effnlink = ip->i_ffs_nlink; brelse(bp); @@ -1196,7 +1196,7 @@ retry: *vpp = NULL; return (error); } - ip->i_din.ffs_din = *((struct dinode *)bp->b_data + ino_to_fsbo(fs, ino)); + ip->i_din1 = *((struct ufs1_dinode *)bp->b_data + ino_to_fsbo(fs, ino)); if (DOINGSOFTDEP(vp)) softdep_load_inodeblock(ip); else @@ -1234,8 +1234,8 @@ retry: * fix until fsck has been changed to do the update. */ if (fs->fs_inodefmt < FS_44INODEFMT) { /* XXX */ - ip->i_ffs_uid = ip->i_din.ffs_din.di_ouid; /* XXX */ - ip->i_ffs_gid = ip->i_din.ffs_din.di_ogid; /* XXX */ + ip->i_ffs_uid = ip->i_din1.di_ouid; /* XXX */ + ip->i_ffs_gid = ip->i_din1.di_ogid; /* XXX */ } /* XXX */ *vpp = vp; |