Changeset 3082 in kBuild for trunk/src/lib/nt/kFsCache.c

Timestamp:

Oct 2, 2017 7:23:17 PM (8 years ago)

Author:

bird

Message:

nt/kFsCache: Fixed buggy negative lookup caching.

File:

• trunk/src/lib/nt/kFsCache.c (modified) (12 diffs)

trunk/src/lib/nt/kFsCache.c

@@ -2748 +2748 @@
  *                              failed.
  * @param   ppLastAncestor      Where to return the last parent element found
- *                              (referenced) in case of error an path/file not
- *                              found problem.  Optional.
+ *                              (referenced) in case of error like an path/file
+ *                              not found problem.  Optional.
  */
 PKFSOBJ kFsCacheLookupRelativeToDirA(PKFSCACHE pCache, PKFSDIR pParent, const char *pszPath, KU32 cchPath, KU32 fFlags,
@@ -2795 +2795 @@
         { /* likely */ }
         else
+        {
+            if (ppLastAncestor)
+                *ppLastAncestor = kFsCacheObjRetainInternal(&pParent->Obj);
             return NULL;
+        }
 
         /*
@@ -2836 +2840 @@
             { /* likely */ }
             else
+            {
+                if (ppLastAncestor)
+                    *ppLastAncestor = kFsCacheObjRetainInternal(&pParent->Obj);
                 return NULL;
+            }
             return kFsCacheObjRetainInternal(pChild);
         }
@@ -2872 +2880 @@
     }
 
+    /* not reached */
     return NULL;
-
 }
 
@@ -2894 +2902 @@
  *                              failed.
  * @param   ppLastAncestor      Where to return the last parent element found
- *                              (referenced) in case of error an path/file not
- *                              found problem.  Optional.
+ *                              (referenced) in case of error like an path/file
+ *                              not found problem.  Optional.
  */
 PKFSOBJ kFsCacheLookupRelativeToDirW(PKFSCACHE pCache, PKFSDIR pParent, const wchar_t *pwszPath, KU32 cwcPath, KU32 fFlags,
@@ -2941 +2949 @@
         { /* likely */ }
         else
+        {
+            if (ppLastAncestor)
+                *ppLastAncestor = kFsCacheObjRetainInternal(&pParent->Obj);
             return NULL;
+        }
 
         /*
@@ -2982 +2994 @@
             { /* likely */ }
             else
+            {
+                if (ppLastAncestor)
+                    *ppLastAncestor = kFsCacheObjRetainInternal(&pParent->Obj);
                 return NULL;
+            }
             return kFsCacheObjRetainInternal(pChild);
         }
@@ -3020 +3036 @@
 
     return NULL;
-
 }
 
@@ -3097 +3112 @@
             || kFsCacheRefreshObj(pCache, pRoot, penmError))
             return kFsCacheObjRetainInternal(pRoot);
+        if (ppLastAncestor)
+            *ppLastAncestor = kFsCacheObjRetainInternal(pRoot);
         return NULL;
     }
@@ -3196 +3213 @@
             || kFsCacheRefreshObj(pCache, pRoot, penmError))
             return kFsCacheObjRetainInternal(pRoot);
+        if (ppLastAncestor)
+            *ppLastAncestor = kFsCacheObjRetainInternal(pRoot);
         return NULL;
     }
@@ -3514 +3533 @@
             || *penmError == KFSLOOKUPERROR_UNSUPPORTED )
             kFsCacheCreatePathHashTabEntryA(pCache, pFsObj, pchPath, cchPath, uHashPath, idxHashTab, fAbsolute,
-                                            pLastAncestor ? pLastAncestor->bObjType & KFSOBJ_F_USE_CUSTOM_GEN : 0, *penmError);
+                                            pLastAncestor ? pLastAncestor->fFlags & KFSOBJ_F_USE_CUSTOM_GEN : 0, *penmError);
         if (pLastAncestor)
             kFsCacheObjRelease(pCache, pLastAncestor);
@@ -3622 +3641 @@
             || *penmError == KFSLOOKUPERROR_UNSUPPORTED )
             kFsCacheCreatePathHashTabEntryW(pCache, pFsObj, pwcPath, cwcPath, uHashPath, idxHashTab, fAbsolute,
-                                            pLastAncestor ? pLastAncestor->bObjType & KFSOBJ_F_USE_CUSTOM_GEN : 0, *penmError);
+                                            pLastAncestor ? pLastAncestor->fFlags & KFSOBJ_F_USE_CUSTOM_GEN : 0, *penmError);
         if (pLastAncestor)
             kFsCacheObjRelease(pCache, pLastAncestor);