From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Fri, 14 Mar 2008 16:16:14 +0000 (+0000)
Subject: windows-max-volumes-20080314
X-Git-Tag: BP-openafs-windows-kdfs-ifs~14
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3a0fa5627bd5254f37aa5c2fb04ca7d27f0a06c1;p=packages%2Fo%2Fopenafs.git

windows-max-volumes-20080314

LICENSE MIT

Propagate the max volumes value into cm_memmap
---

diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c
index 7e640e68f..fcb2b1715 100644
--- a/src/WINNT/afsd/afsd_init.c
+++ b/src/WINNT/afsd/afsd_init.c
@@ -779,7 +779,7 @@ int afsd_InitCM(char **reasonP)
     }
 
     dummyLen = sizeof(volumes);
-    code = RegQueryValueEx(parmKey, "Volumess", NULL, NULL,
+    code = RegQueryValueEx(parmKey, "Volumes", NULL, NULL,
                             (BYTE *) &volumes, &dummyLen);
     if (code == ERROR_SUCCESS)
         afsi_log("Volumes cache entries: %d", volumes);
@@ -1232,7 +1232,7 @@ int afsd_InitCM(char **reasonP)
         
     cm_InitCallback();
 
-    code = cm_InitMappedMemory(virtualCache, cm_CachePath, stats, cm_chunkSize, cacheBlocks, blockSize);
+    code = cm_InitMappedMemory(virtualCache, cm_CachePath, stats, volumes, cm_chunkSize, cacheBlocks, blockSize);
     afsi_log("cm_InitMappedMemory code %x", code);
     if (code != 0) {
         *reasonP = "error initializing cache file";
diff --git a/src/WINNT/afsd/cm_memmap.c b/src/WINNT/afsd/cm_memmap.c
index 5ee760fe8..5fa86954b 100644
--- a/src/WINNT/afsd/cm_memmap.c
+++ b/src/WINNT/afsd/cm_memmap.c
@@ -622,14 +622,13 @@ GetMachineSid(PBYTE SidBuffer, DWORD SidSize)
 }
 
 int
-cm_InitMappedMemory(DWORD virtualCache, char * cachePath, DWORD stats, DWORD chunkSize, 
+cm_InitMappedMemory(DWORD virtualCache, char * cachePath, DWORD stats, DWORD maxVols, DWORD chunkSize, 
                     afs_uint64 cacheBlocks, afs_uint32 blockSize)
 {
     HANDLE hf = INVALID_HANDLE_VALUE, hm;
     PSECURITY_ATTRIBUTES psa;
     int newFile = 1;
     afs_uint64 mappingSize;
-    DWORD maxVols = stats/2;
     DWORD maxCells = stats/4;
     DWORD volumeSerialNumber = 0;
     DWORD sidStringSize = 0;
diff --git a/src/WINNT/afsd/cm_memmap.h b/src/WINNT/afsd/cm_memmap.h
index de2271006..ad357857d 100644
--- a/src/WINNT/afsd/cm_memmap.h
+++ b/src/WINNT/afsd/cm_memmap.h
@@ -116,5 +116,5 @@ PSECURITY_ATTRIBUTES CreateCacheFileSA();
 VOID  FreeCacheFileSA(PSECURITY_ATTRIBUTES psa);
 int   cm_ShutdownMappedMemory(void);
 int   cm_ValidateMappedMemory(char * cachePath);
-int   cm_InitMappedMemory(DWORD virtualCache, char * cachePath, DWORD stats, DWORD chunkSize, afs_uint64 cacheBlocks, afs_uint32 blockSize);
+int   cm_InitMappedMemory(DWORD virtualCache, char * cachePath, DWORD stats, DWORD maxVols, DWORD chunkSize, afs_uint64 cacheBlocks, afs_uint32 blockSize);
 #endif /* CM_MEMMAP_H */
\ No newline at end of file