macos-osi-flushpages-20050428

reenable osi_FlushPages
This commit is contained in:
Derrick Brashear 2005-04-29 02:48:21 +00:00
parent 4fa2511a44
commit a15d665e1d

View File

@ -345,9 +345,7 @@ afs_vop_open(ap)
if (AFSTOV(vc) != vp) if (AFSTOV(vc) != vp)
panic("AFS open changed vnode!"); panic("AFS open changed vnode!");
#endif #endif
#if 0
osi_FlushPages(vc, ap->a_cred); osi_FlushPages(vc, ap->a_cred);
#endif
AFS_GUNLOCK(); AFS_GUNLOCK();
#ifdef AFS_DARWIN14_ENV #ifdef AFS_DARWIN14_ENV
if (error && didhold) if (error && didhold)
@ -373,9 +371,7 @@ afs_vop_close(ap)
code = afs_close(avc, ap->a_fflag, ap->a_cred, ap->a_p); code = afs_close(avc, ap->a_fflag, ap->a_cred, ap->a_p);
else else
code = afs_close(avc, ap->a_fflag, &afs_osi_cred, ap->a_p); code = afs_close(avc, ap->a_fflag, &afs_osi_cred, ap->a_p);
#if 0
osi_FlushPages(avc, ap->a_cred); /* hold bozon lock, but not basic vnode lock */ osi_FlushPages(avc, ap->a_cred); /* hold bozon lock, but not basic vnode lock */
#endif
AFS_GUNLOCK(); AFS_GUNLOCK();
return code; return code;
@ -443,9 +439,7 @@ afs_vop_read(ap)
struct vnode *vp = ap->a_vp; struct vnode *vp = ap->a_vp;
struct vcache *avc = VTOAFS(vp); struct vcache *avc = VTOAFS(vp);
AFS_GLOCK(); AFS_GLOCK();
#if 0
osi_FlushPages(avc, ap->a_cred); /* hold bozon lock, but not basic vnode lock */ osi_FlushPages(avc, ap->a_cred); /* hold bozon lock, but not basic vnode lock */
#endif
code = afs_read(avc, ap->a_uio, ap->a_cred, 0, 0, 0); code = afs_read(avc, ap->a_uio, ap->a_cred, 0, 0, 0);
AFS_GUNLOCK(); AFS_GUNLOCK();
return code; return code;
@ -521,9 +515,7 @@ afs_vop_pagein(ap)
auio.uio_resid = aiov.iov_len = size; auio.uio_resid = aiov.iov_len = size;
aiov.iov_base = (caddr_t) ioaddr; aiov.iov_base = (caddr_t) ioaddr;
AFS_GLOCK(); AFS_GLOCK();
#if 0
osi_FlushPages(tvc, ap->a_cred); /* hold bozon lock, but not basic vnode lock */ osi_FlushPages(tvc, ap->a_cred); /* hold bozon lock, but not basic vnode lock */
#endif
code = afs_read(tvc, uio, cred, 0, 0, 0); code = afs_read(tvc, uio, cred, 0, 0, 0);
if (code == 0) { if (code == 0) {
ObtainWriteLock(&tvc->lock, 2); ObtainWriteLock(&tvc->lock, 2);
@ -564,9 +556,7 @@ afs_vop_write(ap)
struct vcache *avc = VTOAFS(ap->a_vp); struct vcache *avc = VTOAFS(ap->a_vp);
void *object; void *object;
AFS_GLOCK(); AFS_GLOCK();
#if 0
osi_FlushPages(avc, ap->a_cred); /* hold bozon lock, but not basic vnode lock */ osi_FlushPages(avc, ap->a_cred); /* hold bozon lock, but not basic vnode lock */
#endif
if (UBCINFOEXISTS(ap->a_vp)) { if (UBCINFOEXISTS(ap->a_vp)) {
ubc_clean(ap->a_vp, 1); ubc_clean(ap->a_vp, 1);
} }
@ -709,9 +699,7 @@ afs_vop_pageout(ap)
#endif /* ] USV */ #endif /* ] USV */
AFS_GLOCK(); AFS_GLOCK();
#if 0
osi_FlushPages(tvc, ap->a_cred); /* hold bozon lock, but not basic vnode lock */ osi_FlushPages(tvc, ap->a_cred); /* hold bozon lock, but not basic vnode lock */
#endif
ObtainWriteLock(&tvc->lock, 1); ObtainWriteLock(&tvc->lock, 1);
afs_FakeOpen(tvc); afs_FakeOpen(tvc);
ReleaseWriteLock(&tvc->lock); ReleaseWriteLock(&tvc->lock);