From dbb3f1d0b6e2e1e42b1f0ef4c29c21d8090e605a Mon Sep 17 00:00:00 2001 From: Jim Rees Date: Thu, 3 Jan 2008 17:46:08 +0000 Subject: [PATCH] obsd-buf-fixes-20080103 use new b_data field in struct buf --- src/afs/OBSD/osi_vnodeops.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/afs/OBSD/osi_vnodeops.c b/src/afs/OBSD/osi_vnodeops.c index 9f36f30cb..bb4469919 100644 --- a/src/afs/OBSD/osi_vnodeops.c +++ b/src/afs/OBSD/osi_vnodeops.c @@ -144,8 +144,6 @@ int afs_nbsd_readdir(void *); int afs_nbsd_readlink(void *); int afs_nbsd_inactive(void *); int afs_nbsd_reclaim(void *); -int afs_nbsd_lock(void *); -int afs_nbsd_unlock(void *); int afs_nbsd_bmap(void *); int afs_nbsd_strategy(void *); int afs_nbsd_print(void *); @@ -934,7 +932,7 @@ afs_nbsd_bmap(void *v) AFS_STATCNT(afs_bmap); if (ap->a_bnp) - ap->a_bnp = (daddr_t *) (ap->a_bn * (8192 / DEV_BSIZE)); + *ap->a_bnp = ap->a_bn * btodb(8192); if (ap->a_vpp) *ap->a_vpp = (vcp) ? AFSTOV(vcp) : NULL; return 0; @@ -960,15 +958,14 @@ afs_nbsd_strategy(void *v) tuio.afsio_iovcnt = 1; tuio.afsio_seg = AFS_UIOSYS; tuio.afsio_resid = len; - tiovec[0].iov_base = abp->b_un.b_addr; + tiovec[0].iov_base = abp->b_data; tiovec[0].iov_len = len; AFS_GLOCK(); if ((abp->b_flags & B_READ) == B_READ) { code = afs_rdwr(tvc, &tuio, UIO_READ, 0, credp); if (code == 0 && tuio.afsio_resid > 0) - bzero(abp->b_un.b_addr + len - tuio.afsio_resid, - tuio.afsio_resid); + bzero(abp->b_data + len - tuio.afsio_resid, tuio.afsio_resid); } else code = afs_rdwr(tvc, &tuio, UIO_WRITE, 0, credp); AFS_GUNLOCK(); -- 2.39.5