STABLE14-windows-dot-dir-part-two-20060906

cm_LookupInternal can return the input stat cache entry when the name
is "."

the DNLC should not cache "." or ".."

(cherry picked from commit a63d753df88e547606f703764031ad1b9d18fa82)

diff --git a/src/WINNT/afsd/cm_dnlc.c b/src/WINNT/afsd/cm_dnlc.c
index 47bbd75861bebeb74db81c3d39a07ef6c5c3987b..2cf2b3fcbcc07f286efe7938ce6c927f5bd6c373 100644 (file)
--- a/src/WINNT/afsd/cm_dnlc.c
+++ b/src/WINNT/afsd/cm_dnlc.c
@@ -133,7 +133,10 @@ cm_dnlcEnter ( cm_scache_t *adp,
 
     if (!cm_useDnlc)
        return ;
-  
+
+    if (!strcmp(aname,".") || !strcmp(aname,".."))
+       return ;
+
     if ( cm_debugDnlc ) 
        osi_Log3(afsd_logp,"cm_dnlcEnter dir %x name %s scache %x", 
            adp, osi_LogSaveString(afsd_logp,aname), avc);

diff --git a/src/WINNT/afsd/cm_vnodeops.c b/src/WINNT/afsd/cm_vnodeops.c
index 2220f50acb0a415ceab6429f557a6591376500a9..2ecdb5b3a420344561787dfb633912f160fcba9c 100644 (file)
--- a/src/WINNT/afsd/cm_vnodeops.c
+++ b/src/WINNT/afsd/cm_vnodeops.c
@@ -1077,6 +1077,9 @@ long cm_LookupInternal(cm_scache_t *dscp, char *namep, long flags, cm_user_t *us
             return CM_ERROR_NOSUCHVOLUME;
         rock.fid = dscp->dotdotFid;
         goto haveFid;
+    } else if (strcmp(namep, ".") == 0) {
+       rock.fid = dscp->fid;
+       goto haveFid;
     }
 
     memset(&rock, 0, sizeof(rock));