DEVEL15-viced-cleanup-head-20070810

fix demand attach rwlock code on macos, fix host tracking code everywhere

only applies to head and 1.5

(cherry picked from commit 493cad12aa00c321ad125118a9bd9b037a651863)

diff --git a/src/viced/host.c b/src/viced/host.c
index 58b94ac621fdb65781e041996a5450e2079c8006..ee30ae07a78e99e86f80b30af194eefc6a9bbfe3 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -2630,7 +2630,7 @@ h_stateVerifyAddrHash(struct fs_dump_state * state, struct host * h, afs_uint32
 {
     int ret = 0, found = 0;
     struct host *host = NULL;
-    struct h_hashChain *chain;
+    struct h_AddrHashChain *chain;
     int index = h_HashIndex(addr);
     char tmp[16];
     int chain_len = 0;
@@ -2682,7 +2682,7 @@ h_stateVerifyUuidHash(struct fs_dump_state * state, struct host * h)
 {
     int ret = 0, found = 0;
     struct host *host = NULL;
-    struct h_hashChain *chain;
+    struct h_UuidHashChain *chain;
     afsUUID * uuidp = &h->interface->uuid;
     int index = h_UuidHashIndex(uuidp);
     char tmp[40];

diff --git a/src/viced/viced.c b/src/viced/viced.c
index a27043d6fe36cd8838ac49696796675ecac1582a..d09d801376949592f0fc31b57f01c1072970fa25 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -229,6 +229,11 @@ static void FlagMsg();
  * certain background threads before we are allowed to dump state to
  * disk
  */
+
+#if !defined(PTHREAD_RWLOCK_INITIALIZER) && defined(AFS_DARWIN80_ENV)
+#define PTHREAD_RWLOCK_INITIALIZER {0x2DA8B3B4, {0}}
+#endif
+
 struct fs_state fs_state = 
     { FS_MODE_NORMAL, 
       0, 

diff --git a/src/vol/volume.c b/src/vol/volume.c
index 91ede86e9428c64121beb7b60942285cefc6239c..bf1668520ef6a93af682534e767256430af0ef79 100644 (file)
--- a/src/vol/volume.c
+++ b/src/vol/volume.c
@@ -5997,7 +5997,7 @@ DoubleToPrintable(double x, char * buf, int len)
     return buf;
 }
 
-static void
+void
 VPrintExtendedCacheStats_r(int flags)
 {
     int i, j;