viced-cleanup-head-20070810

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

only applies to head and 1.5

diff --git a/src/viced/host.c b/src/viced/host.c
index ffca9e30c2a8505be251023d387064468adab758..889998b07157f0fb7491d5c9e438809c36f82a2b 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -2631,7 +2631,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;
@@ -2683,7 +2683,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 e24d9bd7f61b7484aecf13029118f0df18ca5623..2d34c35ae3497923d2b368cd47c681fc085dbf68 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -233,6 +233,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,