Clean up the prefetch code for Linux, by calling afs_PrefetchChunk

[openafs.git] / src / afs / VNOPS / afs_vnop_read.c

diff --git a/src/afs/VNOPS/afs_vnop_read.c b/src/afs/VNOPS/afs_vnop_read.c
index 886d081..142c686 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_read.c
+++ b/src/afs/VNOPS/afs_vnop_read.c
@@ -330,7 +330,7 @@ tagain:
      */
     if (tdc) {
        ReleaseReadLock(&tdc->lock);
-#ifndef        AFS_VM_RDWR_ENV
+#if !defined(AFS_VM_RDWR_ENV)
        /* try to queue prefetch, if needed */
        if (!noLock) {
            afs_PrefetchChunk(avc, tdc, acred, &treq);
@@ -559,7 +559,7 @@ afs_UFSReadFast(avc, auio, acred, albn, abpp, noLock)
 
            if (!noLock) {
                ReleaseReadLock(&avc->lock);
-#ifndef        AFS_VM_RDWR_ENV
+#if !defined(AFS_VM_RDWR_ENV)
                if (!(code = afs_InitReq(&treq, acred))) {
                    if (!(tdc->mflags & DFNextStarted))
                        afs_PrefetchChunk(avc, tdc, acred, &treq);
@@ -937,7 +937,7 @@ tagain:
 #if defined(AFS_FBSD_ENV)
             AFS_GUNLOCK();
             VOP_LOCK(tfile->vnode, LK_EXCLUSIVE, curproc);
-            code = VOP_READ(tfile->vnode, auio, 0, &afs_osi_cred);
+            code = VOP_READ(tfile->vnode, &tuio, 0, &afs_osi_cred);
             VOP_UNLOCK(tfile->vnode, 0, curproc);
             AFS_GLOCK();
 #else
@@ -982,7 +982,7 @@ tagain:
      */
     if (tdc) {
        ReleaseReadLock(&tdc->lock);
-#ifndef        AFS_VM_RDWR_ENV
+#if !defined(AFS_VM_RDWR_ENV)
        /* try to queue prefetch, if needed */
        if (!noLock) {
            if (!(tdc->mflags & DFNextStarted))