jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DEVEL15-windows-freelance-20080301

Browse Source 
LICENSE MIT

when support for multiple valid buffer data versions was added
forget to remove the force dv change from the freelance code.
this broken automatic additions of new mount points.


(cherry picked from commit 7083ceec5c21e500f23110152dcc994c7ccfab92)
This commit is contained in:
Jeffrey Altman 2008-03-01 17:44:28 +00:00
parent da2bc8dc95
commit 47801d13e0
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/WINNT/afsd/afsd.h
View File

@ -112,12 +112,10 @@ extern cm_localMountPoint_t* cm_localMountPoints; // array of fake mountpoints
extern int cm_fakeDirSize; // size (in bytes) of fake root.afs directory
extern int cm_fakeDirCallback; // state of the fake root.afs directory. indicates
// if it needs to be refreshed
// if it needs to be refreshed
extern int cm_fakeGettingCallback; // 1 if currently updating the fake root.afs directory,
// 0 otherwise
extern int cm_fakeDirVersion; // the version number of the root.afs directory. used
// 0 otherwise
#endif /* AFS_FREELANCE_CLIENT */
extern int cm_dnsEnabled;

3
src/WINNT/afsd/afsd_init.c
View File

@ -62,9 +62,6 @@ char cm_mountRoot[1024];
DWORD cm_mountRootLen;
int cm_logChunkSize;
int cm_chunkSize;
#ifdef AFS_FREELANCE_CLIENT
char *cm_FakeRootDir;
#endif /* freelance */
int smb_UseV3 = 1;

16
src/WINNT/afsd/cm_freelance.c
View File

@ -23,7 +23,8 @@
extern void afsi_log(char *pattern, ...);
int cm_noLocalMountPoints;
int cm_fakeDirSize;
char * cm_FakeRootDir = NULL;
int cm_fakeDirSize = 0;
int cm_fakeDirCallback=0;
int cm_fakeGettingCallback=0;
cm_localMountPoint_t* cm_localMountPoints;
@ -231,8 +232,12 @@ void cm_InitFakeRootDir() {
}
dirSize = (curPage+1) * CM_DIR_PAGESIZE;
cm_FakeRootDir = malloc(dirSize);
cm_fakeDirSize = dirSize;
if (cm_fakeDirSize != dirSize) {
if (cm_FakeRootDir)
free(cm_FakeRootDir);
cm_FakeRootDir = malloc(dirSize);
cm_fakeDirSize = dirSize;
}
// yj: when we get here, we've figured out how much memory we need and
// allocated the appropriate space for it. we now prceed to fill
@ -447,11 +452,6 @@ int cm_reInitLocalMountPoints() {
cm_InitLocalMountPoints();
osi_Log0(afsd_logp,"\tcreated new set of localmountpoints!");
// now we have to free the memory allocated in cm_initfakerootdir
osi_Log0(afsd_logp,"Removing old fakedir... ");
free(cm_FakeRootDir);
osi_Log0(afsd_logp,"\t\told fakedir removed!");
// then we re-create that dir
osi_Log0(afsd_logp,"Creating new fakedir... ");
cm_InitFakeRootDir();

2
src/WINNT/afsd/cm_scache.c
View File

@ -1523,8 +1523,6 @@ void cm_MergeStatus(cm_scache_t *dscp,
statusp->SyncCounter = 0;
statusp->dataVersionHigh = (afs_uint32)(cm_data.fakeDirVersion >> 32);
statusp->errorCode = 0;
buf_ForceDataVersion(scp, scp->dataVersion, cm_data.fakeDirVersion);
}
#endif /* AFS_FREELANCE_CLIENT */