STABLE14-windows-afsd-service-20051121

improvements to VNOVNODE fix

diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c
index 6251c7ef4b2d26b65fc424a90544bd746bbc3d4f..1478d05a215d664e3bdabe7c22f575d6deeeae93 100644 (file)
--- a/src/WINNT/afsd/cm_conn.c
+++ b/src/WINNT/afsd/cm_conn.c
@@ -406,17 +406,11 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp,
            cm_scache_t * scp;
            osi_Log4(afsd_logp, "cm_Analyze passed VNOVNODE cell %u vol %u vn %u uniq %u.",
                      fidp->cell, fidp->volume, fidp->vnode, fidp->unique);
-#ifdef VNOVNODE_FLUSH_VOLUME
-           cm_FlushVolume(userp, reqp, fidp->cell, fidp->volume);
-#else /* VNOVNODE_FLUSH_FILE */
            if (!cm_GetSCache(fidp, &scp, userp, reqp)) {
-               cm_FlushFile(scp, userp, reqp);
-#ifdef VNOVNODE_FLUSH_PARENT
                cm_FlushParent(scp, userp, reqp);
-#endif /* VNOVNODE_FLUSH_PARENT */
+               cm_FlushFile(scp, userp, reqp);
                cm_ReleaseSCache(scp);
            }
-#endif /* VNODE_FLUSH_xxxx */
        } else {
            osi_Log0(afsd_logp, "cm_Analyze passed VNOVNODE unknown fid.");
        }

diff --git a/src/WINNT/afsd/cm_ioctl.c b/src/WINNT/afsd/cm_ioctl.c
index 8e41311a1be2ab9b63b917432611ed66128a5ef2..ffdd6d59c21a2fb30b03502fdcfc91f1b1605826 100644 (file)
--- a/src/WINNT/afsd/cm_ioctl.c
+++ b/src/WINNT/afsd/cm_ioctl.c
@@ -82,7 +82,7 @@ long cm_FlushFile(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp)
     lock_ReleaseMutex(&scp->mx);
 
     lock_ReleaseWrite(&scp->bufCreateLock);
-    afsi_log("cm_FlushFile scp 0x%x returns error: [%x]",scp, code);
+    osi_Log2(afsd_logp,"cm_FlushFile scp 0x%x returns error: [%x]",scp, code);
     return code;
 }
 
@@ -101,7 +101,7 @@ long cm_FlushParent(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp)
 
     for (i=0; i<cm_data.hashTableSize; i++) {
         for (scp = cm_data.hashTablep[i]; scp; scp = scp->nextp) {
-            if (cm_FidCmp(&scp->fid, &parent_fid)) {
+            if (!cm_FidCmp(&scp->fid, &parent_fid)) {
                 cm_HoldSCacheNoLock(scp);
                 lock_ReleaseWrite(&cm_scacheLock);