de-printf the cache manager

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

diff --git a/src/afs/VNOPS/afs_vnop_open.c b/src/afs/VNOPS/afs_vnop_open.c
index 037cc8e..6e8d2d5 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_open.c
+++ b/src/afs/VNOPS/afs_vnop_open.c
@@ -17,8 +17,6 @@
 #include <afsconfig.h>
 #include "afs/param.h"
 
-RCSID
-    ("$Header$");
 
 #include "afs/sysincludes.h"   /* Standard vendor system headers */
 #include "afsincludes.h"       /* Afs-based standard headers */
@@ -36,9 +34,9 @@ RCSID
 int
 #ifdef AFS_SGI64_ENV
 afs_open(bhv_desc_t * bhv, struct vcache **avcp, afs_int32 aflags,
-        struct AFS_UCRED *acred)
+        afs_ucred_t *acred)
 #else
-afs_open(struct vcache **avcp, afs_int32 aflags, struct AFS_UCRED *acred)
+afs_open(struct vcache **avcp, afs_int32 aflags, afs_ucred_t *acred)
 #endif
 {
     register afs_int32 code;
@@ -74,7 +72,7 @@ afs_open(struct vcache **avcp, afs_int32 aflags, struct AFS_UCRED *acred)
 #ifdef AFS_DISCON_ENV
     if (AFS_IS_DISCONNECTED && (afs_DCacheMissingChunks(tvc) != 0)) {
        ReleaseReadLock(&tvc->lock);
-       /*printf("Network is down in afs_open: missing chunks\n");*/
+       /* printf("Network is down in afs_open: missing chunks\n"); */
        code = ENETDOWN;
        goto done;
     }
@@ -93,9 +91,10 @@ afs_open(struct vcache **avcp, afs_int32 aflags, struct AFS_UCRED *acred)
            goto done;
        } else {
            if (!afs_AccessOK
-               (tvc, ((tvc->states & CForeign) ? PRSFS_READ : PRSFS_LOOKUP),
+               (tvc, ((tvc->f.states & CForeign) ? PRSFS_READ : PRSFS_LOOKUP),
                 &treq, CHECK_MODE_BITS)) {
                code = EACCES;
+               /* printf("afs_Open: no access for dir\n"); */
                goto done;
            }
        }
@@ -152,15 +151,15 @@ afs_open(struct vcache **avcp, afs_int32 aflags, struct AFS_UCRED *acred)
     if (aflags & FTRUNC) {
        /* this fixes touch */
        ObtainWriteLock(&tvc->lock, 123);
-       tvc->m.Date = osi_Time();
-       tvc->states |= CDirty;
+       tvc->f.m.Date = osi_Time();
+       tvc->f.states |= CDirty;
        ReleaseWriteLock(&tvc->lock);
     }
     ObtainReadLock(&tvc->lock);
     if (writing)
        tvc->execsOrWriters++;
     tvc->opens++;
-#if defined(AFS_SGI_ENV)
+#if defined(AFS_SGI_ENV) || defined (AFS_LINUX26_ENV)
     if (writing && tvc->cred == NULL) {
        crhold(acred);
        tvc->cred = acred;
@@ -170,7 +169,7 @@ afs_open(struct vcache **avcp, afs_int32 aflags, struct AFS_UCRED *acred)
     if ((afs_preCache != 0) && (writing == 0) && (vType(tvc) != VDIR) && 
        (!afs_BBusy())) {
        register struct dcache *tdc;
-       afs_size_t offset, len, totallen = 0;
+       afs_size_t offset, len;
 
        tdc = afs_GetDCache(tvc, 0, &treq, &offset, &len, 1);
 
@@ -187,7 +186,8 @@ afs_open(struct vcache **avcp, afs_int32 aflags, struct AFS_UCRED *acred)
               doing so ourselves.
            */
            bp = afs_BQueue(BOP_FETCH, tvc, B_DONTWAIT, 0, acred,
-                           (afs_size_t) 0, (afs_size_t) 1, tdc);
+                           (afs_size_t) 0, (afs_size_t) 1, tdc,
+                           (void *)0, (void *)0);
            if (!bp) {
                tdc->mflags &= ~DFFetchReq;
            }