From 493cad12aa00c321ad125118a9bd9b037a651863 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Fri, 10 Aug 2007 05:11:35 +0000 Subject: [PATCH] viced-cleanup-head-20070810 fix demand attach rwlock code on macos, fix host tracking code everywhere only applies to head and 1.5 --- src/viced/host.c | 4 ++-- src/viced/viced.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/viced/host.c b/src/viced/host.c index ffca9e30c..889998b07 100644 --- 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 e24d9bd7f..2d34c35ae 100644 --- 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, -- 2.39.5