diff options
| author | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 2001-02-23 14:42:40 +0000 |
|---|---|---|
| committer | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 2001-02-23 14:42:40 +0000 |
| commit | 96e821437735f981862bb50be47e2c291a615907 (patch) | |
| tree | 163b1a3c8a068ad3cf4e4e6e3ba48d03a79eec2c /sys/msdosfs | |
| parent | 51008faf3223ac4bc87038c7550574709c459445 (diff) | |
Remove the clustering fields from the vnodes and place them in the
file system inode instead
Diffstat (limited to 'sys/msdosfs')
| -rw-r--r-- | sys/msdosfs/denode.h | 3 | ||||
| -rw-r--r-- | sys/msdosfs/msdosfs_vnops.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/msdosfs/denode.h b/sys/msdosfs/denode.h index 23aa4c78889..6a573fa2ada 100644 --- a/sys/msdosfs/denode.h +++ b/sys/msdosfs/denode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: denode.h,v 1.8 1999/11/17 09:27:22 art Exp $ */ +/* $OpenBSD: denode.h,v 1.9 2001/02/23 14:42:38 csapuntz Exp $ */ /* $NetBSD: denode.h,v 1.24 1997/10/17 11:23:39 ws Exp $ */ /*- @@ -141,6 +141,7 @@ struct denode { struct vnode *de_devvp; /* vnode of blk dev we live on */ u_long de_flag; /* flag bits */ dev_t de_dev; /* device where direntry lives */ + daddr_t de_lastr; u_long de_dirclust; /* cluster of the directory file containing this entry */ u_long de_diroffset; /* offset of this entry in the directory cluster */ u_long de_fndoffset; /* offset of found dir entry */ diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index bd93befb3d2..f2fa0cadeda 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vnops.c,v 1.22 2000/06/07 15:04:06 art Exp $ */ +/* $OpenBSD: msdosfs_vnops.c,v 1.23 2001/02/23 14:42:38 csapuntz Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */ /*- @@ -469,7 +469,7 @@ msdosfs_read(v) error = bread(pmp->pm_devvp, lbn, blsize, NOCRED, &bp); } else { rablock = lbn + 1; - if (vp->v_lastr + 1 == lbn && + if (dep->de_lastr + 1 == lbn && de_cn2off(pmp, rablock) < dep->de_FileSize) error = breada(vp, de_cn2bn(pmp, lbn), pmp->pm_bpcluster, de_cn2bn(pmp, rablock), @@ -477,7 +477,7 @@ msdosfs_read(v) else error = bread(vp, de_cn2bn(pmp, lbn), pmp->pm_bpcluster, NOCRED, &bp); - vp->v_lastr = lbn; + dep->de_lastr = lbn; } n = min(n, pmp->pm_bpcluster - bp->b_resid); if (error) { |