From ca0ae15d621dbd90339408a26715a107d1f69f23 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Fri, 4 Mar 2011 23:40:31 -0500 Subject: [PATCH] Revert "modify FindIndex to compare uuids" This reverts commit 9aad0979e9ff0601c249eb66a6ecfb3e76264702. This is being pulled as the entire nvldbentry to uvldbentry conversion is being reverted. Change-Id: Ib226c593b4c1db345758cd8b345a319e6107d3ee Reviewed-on: http://gerrit.openafs.org/4130 Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/volser/lockprocs.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/src/volser/lockprocs.c b/src/volser/lockprocs.c index f4ad9af..7ab1c57 100644 --- a/src/volser/lockprocs.c +++ b/src/volser/lockprocs.c @@ -32,7 +32,6 @@ #include #include #include -#include #include "volint.h" #include "volser.h" #include "lockdata.h" @@ -40,8 +39,6 @@ #include "vsutils_prototypes.h" #include "lockprocs_prototypes.h" -struct ubik_client *cstruct; - /* Finds an index in VLDB entry that matches the volume type, server, and partition. * If type is zero, will match first index of ANY type (RW, BK, or RO). * If server is zero, will match first index of ANY server and partition @@ -52,34 +49,13 @@ FindIndex(struct uvldbentry *entry, afs_uint32 server, afs_int32 part, afs_int32 { int e; afs_int32 error = 0; - afsUUID m_uuid; - int uuid_valid = 0; - - if (server && !afs_uuid_is_nil(&entry->serverNumber[0])) { - afs_int32 vcode, m_uniq=0; - bulkaddrs m_addrs; - ListAddrByAttributes m_attrs; - afs_int32 m_nentries; - - m_attrs.Mask = VLADDR_IPADDR; - m_attrs.ipaddr = htonl(server); - m_nentries = 0; - m_addrs.bulkaddrs_val = 0; - m_addrs.bulkaddrs_len = 0; - vcode = - ubik_VL_GetAddrsU( cstruct, 0, &m_attrs, - &m_uuid, - &m_uniq, &m_nentries, - &m_addrs); - uuid_valid = (vcode == 0); - } for (e = 0; (e < entry->nServers) && !error; e++) { if (!type || (entry->serverFlags[e] & type)) { if ((!server || (entry->serverPartition[e] == part)) && (!server - || (uuid_valid && afs_uuid_equal(&m_uuid, &entry->serverNumber[e])) - || VLDB_IsSameAddrs(entry->serverUnique[e], server, &error))) + || VLDB_IsSameAddrs(entry->serverUnique[e], server, + &error))) break; if (type == ITSRWVOL) return -1; /* quit when we are looking for RW entry (there's only 1) */ -- 1.9.4