diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-05-30 08:35:23 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-05-30 08:35:23 +0000 |
| commit | abede2744bbad7139d9bd3435f5f7ca1d4e85e51 (patch) | |
| tree | 8db1f2051b877c6f22dc49bb6d13be81d4235ec4 /sys/ufs/lfs/lfs_vfsops.c | |
| parent | ec6ef49763f047e88c3866301e0e71dc29900b97 (diff) | |
Integrate new ext2fs, reverting ufs support for the old one.
Diffstat (limited to 'sys/ufs/lfs/lfs_vfsops.c')
| -rw-r--r-- | sys/ufs/lfs/lfs_vfsops.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c index 6023f14073e..d80b15272f4 100644 --- a/sys/ufs/lfs/lfs_vfsops.c +++ b/sys/ufs/lfs/lfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lfs_vfsops.c,v 1.6 1996/07/01 07:41:55 downsj Exp $ */ +/* $OpenBSD: lfs_vfsops.c,v 1.7 1997/05/30 08:34:48 downsj Exp $ */ /* $NetBSD: lfs_vfsops.c,v 1.11 1996/03/25 12:53:35 pk Exp $ */ /* @@ -79,14 +79,6 @@ struct vfsops lfs_vfsops = { lfs_init, }; -static struct ufs_dirops xlfs_dirops = { - ufs_dirremove, - ufs_direnter, - ufs_dirempty, - ufs_dirrewrite, - ufs_checkpath, -}; - int lfs_mountroot() { @@ -318,7 +310,6 @@ lfs_mountfs(devvp, mp, p) ump->um_bptrtodb = 0; ump->um_seqinc = 1 << fs->lfs_fsbtodb; ump->um_nindir = fs->lfs_nindir; - ump->um_dirops = &xlfs_dirops; for (i = 0; i < MAXQUOTAS; i++) ump->um_quotas[i] = NULLVP; devvp->v_specflags |= SI_MOUNTEDON; @@ -545,7 +536,7 @@ lfs_vget(mp, ino, vpp) *vpp = NULL; return (error); } - ip->i_din = *lfs_ifind(fs, ino, (struct dinode *)bp->b_data); + ip->i_din.ffs_din = *lfs_ifind(fs, ino, (struct dinode *)bp->b_data); brelse(bp); /* @@ -615,7 +606,7 @@ lfs_vptofh(vp, fhp) ufhp = (struct ufid *)fhp; ufhp->ufid_len = sizeof(struct ufid); ufhp->ufid_ino = ip->i_number; - ufhp->ufid_gen = ip->i_gen; + ufhp->ufid_gen = ip->i_ffs_gen; return (0); } |