jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 23:10:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows: Permit BPlus tree lookups within cm_ApplyDir

Browse Source 
BPlus tree lookups are much faster than searching through
the native directory format on Windows because the case sensitive
hash tables cannot be used successfully.  Permit BPlus trees
to be used except when called with cm_BPlusDirFoo as the action
function because cm_BPlusDirFoo is used to build the BPlus trees
from the native directory format.

LICENSE MIT

Change-Id: I3f6f5ba7113e206c76fafd1ec83822adc7f42f9e
Reviewed-on: http://gerrit.openafs.org/1893
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
This commit is contained in:
Jeffrey Altman 2010-05-02 15:26:39 -04:00 committed by Jeffrey Altman
parent ebbd415f28
commit 71f91cd93c
1 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/WINNT/afsd/cm_vnodeops.c
View File

@ -483,53 +483,56 @@ long cm_ApplyDir(cm_scache_t *scp, cm_DirFuncp_t funcp, void *parmp,
return 0; return 0;
} }
sp->caseFold = casefold; sp->caseFold = casefold;
}
/* see if we can find it using the directory hash tables. /*
we can only do exact matches, since the hash is case * see if we can find it using the directory hash tables.
sensitive. */ * we can only do exact matches, since the hash is case
{ * sensitive.
cm_dirOp_t dirop; */
if (funcp != (cm_DirFuncp_t)cm_BPlusDirFoo)
{
cm_dirOp_t dirop;
#ifdef USE_BPLUS #ifdef USE_BPLUS
int usedBplus = 0; int usedBplus = 0;
#endif #endif
code = ENOENT; code = ENOENT;
code = cm_BeginDirOp(scp, userp, reqp, CM_DIRLOCK_READ, &dirop); code = cm_BeginDirOp(scp, userp, reqp, CM_DIRLOCK_READ, &dirop);
if (code == 0) { if (code == 0) {
#ifdef USE_BPLUS #ifdef USE_BPLUS
code = cm_BPlusDirLookup(&dirop, sp->nsearchNamep, &sp->fid); code = cm_BPlusDirLookup(&dirop, sp->nsearchNamep, &sp->fid);
if (code != EINVAL) if (code != EINVAL)
usedBplus = 1; usedBplus = 1;
else else
#endif #endif
code = cm_DirLookup(&dirop, sp->searchNamep, &sp->fid); code = cm_DirLookup(&dirop, sp->searchNamep, &sp->fid);
cm_EndDirOp(&dirop); cm_EndDirOp(&dirop);
} }
if (code == 0) { if (code == 0) {
/* found it */
sp->found = TRUE;
sp->ExactFound = TRUE;
*retscp = NULL; /* force caller to call cm_GetSCache() */
return 0;
}
#ifdef USE_BPLUS
if (usedBplus) {
if (sp->caseFold && code == CM_ERROR_INEXACT_MATCH) {
/* found it */ /* found it */
sp->found = TRUE; sp->found = TRUE;
sp->ExactFound = TRUE; sp->ExactFound = FALSE;
*retscp = NULL; /* force caller to call cm_GetSCache() */ *retscp = NULL; /* force caller to call cm_GetSCache() */
return 0; return 0;
} }
#ifdef USE_BPLUS
if (usedBplus) { return CM_ERROR_BPLUS_NOMATCH;
if (sp->caseFold && code == CM_ERROR_INEXACT_MATCH) {
/* found it */
sp->found = TRUE;
sp->ExactFound = FALSE;
*retscp = NULL; /* force caller to call cm_GetSCache() */
return 0;
}
return CM_ERROR_BPLUS_NOMATCH;
}
#endif
} }
#endif
} }
} }