jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 13:38:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "modify FindIndex to compare uuids"

Browse Source 
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 <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Jeffrey Altman 2011-03-04 23:40:31 -05:00 committed by Derrick Brashear
parent 64d52938ee
commit ca0ae15d62
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/volser/lockprocs.c
View File

@ -32,7 +32,6 @@
#include <afs/vlserver.h>
#include <afs/nfs.h>
#include <afs/afsint.h>
#include <ubik.h>
#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) */