diff options
| author | Pedro Martelletto <pedro@cvs.openbsd.org> | 2004-11-30 12:39:44 +0000 |
|---|---|---|
| committer | Pedro Martelletto <pedro@cvs.openbsd.org> | 2004-11-30 12:39:44 +0000 |
| commit | aac8591775e16c95e31690112911357625816025 (patch) | |
| tree | 223e0eab8b258de956a5e578ebc4cd726a28e789 /sys/msdosfs | |
| parent | f99ed56760f81dbdddeda9f84b1f6a122b748825 (diff) | |
kill breada(), from Sven Dehmlow. ok tedu@ millert@
Diffstat (limited to 'sys/msdosfs')
| -rw-r--r-- | sys/msdosfs/msdosfs_vnops.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index 4670f3ded45..44572722268 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vnops.c,v 1.48 2004/11/29 17:05:06 grange Exp $ */ +/* $OpenBSD: msdosfs_vnops.c,v 1.49 2004/11/30 12:39:43 pedro Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */ /*- @@ -432,6 +432,7 @@ msdosfs_read(v) long on; daddr_t lbn; daddr_t rablock; + daddr_t rablkno; struct buf *bp; struct vnode *vp = ap->a_vp; struct denode *dep = VTODE(vp); @@ -471,11 +472,12 @@ msdosfs_read(v) error = bread(pmp->pm_devvp, lbn, blsize, NOCRED, &bp); } else { rablock = lbn + 1; + rablkno = de_cn2bn(pmp, rablock); 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), - pmp->pm_bpcluster, NOCRED, &bp); + error = breadn(vp, de_cn2bn(pmp, lbn), + pmp->pm_bpcluster, &rablkno, + &pmp->pm_bpcluster, 1, NOCRED, &bp); else error = bread(vp, de_cn2bn(pmp, lbn), pmp->pm_bpcluster, NOCRED, &bp); |