/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
*/
+#include <afsconfig.h>
#include <afs/param.h>
#include <afs/stds.h>
+#include <roken.h>
+
#include <windows.h>
#include <winsock2.h>
#include <nb30.h>
osi_rwlock_t cm_volumeLock;
-long
+long
cm_ValidateVolume(void)
{
cm_volume_t * volp;
fprintf(stderr, "cm_ValidateVolume failure: volp->allNextp->magic != CM_VOLUME_MAGIC\n");
return -3;
}
- if ( count != 0 && volp == cm_data.allVolumesp ||
+ if ( count != 0 && volp == cm_data.allVolumesp ||
count > cm_data.maxVolumes ) {
afsi_log("cm_ValidateVolume failure: cm_data.allVolumep loop detected");
fprintf(stderr, "cm_ValidateVolume failure: cm_data.allVolumep loop detected\n");
fprintf(stderr, "cm_ValidateVolume failure: count != cm_data.currentVolumes\n");
return -5;
}
-
+
return 0;
}
afs_uint32 volType;
lock_InitializeRWLock(&volp->rw, "cm_volume_t rwlock", LOCK_HIERARCHY_VOLUME);
- volp->flags |= CM_VOLUMEFLAG_RESET;
- volp->flags &= ~CM_VOLUMEFLAG_UPDATING_VL;
+ _InterlockedOr(&volp->flags, CM_VOLUMEFLAG_RESET);
+ _InterlockedAnd(&volp->flags, ~CM_VOLUMEFLAG_UPDATING_VL);
for (volType = RWVOL; volType < NUM_VOL_TYPES; volType++) {
volp->vol[volType].state = vl_unknown;
volp->vol[volType].serversp = NULL;
/* returns true if the id is a decimal integer, in which case we interpret it
- * as an id. make the cache manager much simpler.
+ * as an id. make the cache manager much simpler.
* Stolen from src/volser/vlprocs.c */
int
cm_VolNameIsID(char *aname)
int freelance = 0;
#endif
afs_uint32 volType;
+ time_t now;
lock_AssertWrite(&volp->rw);
+ /*
+ * If the last volume update was in the last five
+ * minutes and it did not exist, then avoid the RPC
+ * and return No Such Volume immediately.
+ */
+ now = time(NULL);
+ if ((volp->flags & CM_VOLUMEFLAG_NOEXIST) &&
+ (now < volp->lastUpdateTime + 600))
+ {
+ return CM_ERROR_NOSUCHVOLUME;
+ }
+
#ifdef AFS_FREELANCE_CLIENT
- if ( cellp->cellID == AFS_FAKE_ROOT_CELL_ID && volp->vol[RWVOL].ID == AFS_FAKE_ROOT_VOL_ID )
+ if ( cellp->cellID == AFS_FAKE_ROOT_CELL_ID && volp->vol[RWVOL].ID == AFS_FAKE_ROOT_VOL_ID )
{
freelance = 1;
memset(&vldbEntry, 0, sizeof(vldbEntry));
#endif
{
while (volp->flags & CM_VOLUMEFLAG_UPDATING_VL) {
- osi_Log3(afsd_logp, "cm_UpdateVolumeLocation sleeping name %s:%s flags 0x%x",
+ osi_Log3(afsd_logp, "cm_UpdateVolumeLocation sleeping name %s:%s flags 0x%x",
volp->cellp->name, volp->namep, volp->flags);
osi_SleepW((LONG_PTR) &volp->flags, &volp->rw);
lock_ObtainWrite(&volp->rw);
- osi_Log3(afsd_logp, "cm_UpdateVolumeLocation awake name %s:%s flags 0x%x",
+ osi_Log3(afsd_logp, "cm_UpdateVolumeLocation awake name %s:%s flags 0x%x",
volp->cellp->name, volp->namep, volp->flags);
if (!(volp->flags & CM_VOLUMEFLAG_RESET)) {
- osi_Log3(afsd_logp, "cm_UpdateVolumeLocation nothing to do, waking others name %s:%s flags 0x%x",
+ osi_Log3(afsd_logp, "cm_UpdateVolumeLocation nothing to do, waking others name %s:%s flags 0x%x",
volp->cellp->name, volp->namep, volp->flags);
osi_Wakeup((LONG_PTR) &volp->flags);
return 0;
}
}
- /* clear out old bindings */
- for ( volType = RWVOL; volType < NUM_VOL_TYPES; volType++) {
- if (volp->vol[volType].serversp)
- cm_FreeServerList(&volp->vol[volType].serversp, CM_FREESERVERLIST_DELETE);
- }
-
- volp->flags |= CM_VOLUMEFLAG_UPDATING_VL;
+ _InterlockedOr(&volp->flags, CM_VOLUMEFLAG_UPDATING_VL);
lock_ReleaseWrite(&volp->rw);
if (cellp->flags & CM_CELLFLAG_VLSERVER_INVALID)
cm_UpdateCell(cellp, 0);
/* now we have volume structure locked and held; make RPC to fill it */
- osi_Log2(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s",
- osi_LogSaveString(afsd_logp,volp->cellp->name),
+ osi_Log2(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s",
+ osi_LogSaveString(afsd_logp,volp->cellp->name),
osi_LogSaveString(afsd_logp,volp->namep));
do {
struct rx_connection * rxconnp;
code = cm_ConnByMServers(cellp->vlServersp, userp, reqp, &connp);
- if (code)
+ if (code)
continue;
rxconnp = cm_GetRxConn(connp);
#ifdef MULTIHOMED
code = VL_GetEntryByNameU(rxconnp, volp->namep, &uvldbEntry);
method = 2;
- if ( code == RXGEN_OPCODE )
+ if ( code == RXGEN_OPCODE )
#endif
{
code = VL_GetEntryByNameN(rxconnp, volp->namep, &nvldbEntry);
} while (cm_Analyze(connp, userp, reqp, NULL, NULL, cellp->vlServersp, NULL, code));
code = cm_MapVLRPCError(code, reqp);
if ( code )
- osi_Log3(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s FAILURE, code 0x%x",
- osi_LogSaveString(afsd_logp,volp->cellp->name),
+ osi_Log3(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s FAILURE, code 0x%x",
+ osi_LogSaveString(afsd_logp,volp->cellp->name),
osi_LogSaveString(afsd_logp,volp->namep), code);
else
- osi_Log2(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s SUCCESS",
- osi_LogSaveString(afsd_logp,volp->cellp->name),
+ osi_Log2(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s SUCCESS",
+ osi_LogSaveString(afsd_logp,volp->cellp->name),
osi_LogSaveString(afsd_logp,volp->namep));
}
/* We can end up here with code == CM_ERROR_NOSUCHVOLUME if the base volume name
- * does not exist but there might exist a .readonly volume. If the base name
- * doesn't exist we will not care about the .backup that might be left behind
- * since there should be no method to access it.
+ * does not exist and is not a numeric string but there might exist a .readonly volume.
+ * If the base name doesn't exist we will not care about the .backup that might be left
+ * behind since there should be no method to access it.
*/
- if (code == CM_ERROR_NOSUCHVOLUME && volp->vol[RWVOL].ID == 0 && strlen(volp->namep) < (VL_MAXNAMELEN - 9)) {
+ if (code == CM_ERROR_NOSUCHVOLUME &&
+ _atoi64(volp->namep) == 0 &&
+ volp->vol[RWVOL].ID == 0 &&
+ strlen(volp->namep) < (VL_MAXNAMELEN - 9)) {
char name[VL_MAXNAMELEN];
snprintf(name, VL_MAXNAMELEN, "%s.readonly", volp->namep);
-
+
/* now we have volume structure locked and held; make RPC to fill it */
- osi_Log2(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s",
+ osi_Log2(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s",
osi_LogSaveString(afsd_logp,volp->cellp->name),
osi_LogSaveString(afsd_logp,name));
do {
struct rx_connection * rxconnp;
code = cm_ConnByMServers(cellp->vlServersp, userp, reqp, &connp);
- if (code)
+ if (code)
continue;
rxconnp = cm_GetRxConn(connp);
#ifdef MULTIHOMED
code = VL_GetEntryByNameU(connp->rxconnp, name, &uvldbEntry);
method = 2;
- if ( code == RXGEN_OPCODE )
+ if ( code == RXGEN_OPCODE )
#endif
{
code = VL_GetEntryByNameN(connp->rxconnp, name, &nvldbEntry);
} while (cm_Analyze(connp, userp, reqp, NULL, NULL, cellp->vlServersp, NULL, code));
code = cm_MapVLRPCError(code, reqp);
if ( code )
- osi_Log3(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s FAILURE, code 0x%x",
- osi_LogSaveString(afsd_logp,volp->cellp->name),
+ osi_Log3(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s FAILURE, code 0x%x",
+ osi_LogSaveString(afsd_logp,volp->cellp->name),
osi_LogSaveString(afsd_logp,name), code);
else
- osi_Log2(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s SUCCESS",
- osi_LogSaveString(afsd_logp,volp->cellp->name),
+ osi_Log2(afsd_logp, "CALL VL_GetEntryByName{UNO} name %s:%s SUCCESS",
+ osi_LogSaveString(afsd_logp,volp->cellp->name),
osi_LogSaveString(afsd_logp,name));
}
-
+
lock_ObtainWrite(&volp->rw);
if (code == 0) {
afs_int32 flags;
rwServers_alldown = 0;
#endif
+ /* clear out old bindings */
+ for ( volType = RWVOL; volType < NUM_VOL_TYPES; volType++) {
+ if (volp->vol[volType].serversp)
+ cm_FreeServerList(&volp->vol[volType].serversp, CM_FREESERVERLIST_DELETE);
+ }
+
memset(serverUUID, 0, sizeof(serverUUID));
switch ( method ) {
struct rx_connection *rxconnp;
code = cm_ConnByMServers(cellp->vlServersp, userp, reqp, &connp);
- if (code)
+ if (code)
continue;
-
+
rxconnp = cm_GetRxConn(connp);
code = VL_GetAddrsU(rxconnp, &attrs, &uuid, &unique, &nentries, &addrs);
rx_PutConnection(rxconnp);
if ( code ) {
code = cm_MapVLRPCError(code, reqp);
- osi_Log2(afsd_logp, "CALL VL_GetAddrsU serverNumber %u FAILURE, code 0x%x",
+ osi_Log2(afsd_logp, "CALL VL_GetAddrsU serverNumber %u FAILURE, code 0x%x",
i, code);
continue;
- }
+ }
osi_Log1(afsd_logp, "CALL VL_GetAddrsU serverNumber %u SUCCESS", i);
addrp = addrs.bulkaddrs_val;
serverUUID[j] = uuid;
}
- xdr_free(addrs.bulkaddrs_val, addrs.bulkaddrs_len * sizeof(*addrs.bulkaddrs_val));
+ xdr_free((xdrproc_t) xdr_bulkaddrs, &addrs);
if (nentries == 0)
code = CM_ERROR_INVAL;
} else if (len >= 10 && strcmp(name + len - 9, ".readonly") == 0) {
name[len - 9] = '\0';
}
-
- osi_Log2(afsd_logp, "cm_UpdateVolume name %s -> %s",
+
+ osi_Log2(afsd_logp, "cm_UpdateVolume name %s -> %s",
osi_LogSaveString(afsd_logp,volp->namep), osi_LogSaveString(afsd_logp,name));
- if (volp->flags & CM_VOLUMEFLAG_IN_HASH)
+ if (volp->qflags & CM_VOLUME_QFLAG_IN_HASH)
cm_RemoveVolumeFromNameHashTable(volp);
strcpy(volp->namep, name);
}
if (flags & VLF_DFSFILESET) {
- volp->flags |= CM_VOLUMEFLAG_DFS_VOLUME;
+ _InterlockedOr(&volp->flags, CM_VOLUMEFLAG_DFS_VOLUME);
osi_Log1(afsd_logp, "cm_UpdateVolume Volume Group '%s' is a DFS File Set. Correct behavior is not implemented.",
osi_LogSaveString(afsd_logp, volp->namep));
}
if (flags & VLF_RWEXISTS) {
if (volp->vol[RWVOL].ID != rwID) {
- if (volp->vol[RWVOL].flags & CM_VOLUMEFLAG_IN_HASH)
+ if (volp->vol[RWVOL].qflags & CM_VOLUME_QFLAG_IN_HASH)
cm_RemoveVolumeFromIDHashTable(volp, RWVOL);
volp->vol[RWVOL].ID = rwID;
cm_AddVolumeToIDHashTable(volp, RWVOL);
}
} else {
- if (volp->vol[RWVOL].flags & CM_VOLUMEFLAG_IN_HASH)
+ if (volp->vol[RWVOL].qflags & CM_VOLUME_QFLAG_IN_HASH)
cm_RemoveVolumeFromIDHashTable(volp, RWVOL);
volp->vol[RWVOL].ID = 0;
}
if (flags & VLF_ROEXISTS) {
if (volp->vol[ROVOL].ID != roID) {
- if (volp->vol[ROVOL].flags & CM_VOLUMEFLAG_IN_HASH)
+ if (volp->vol[ROVOL].qflags & CM_VOLUME_QFLAG_IN_HASH)
cm_RemoveVolumeFromIDHashTable(volp, ROVOL);
volp->vol[ROVOL].ID = roID;
cm_AddVolumeToIDHashTable(volp, ROVOL);
}
} else {
- if (volp->vol[ROVOL].flags & CM_VOLUMEFLAG_IN_HASH)
+ if (volp->vol[ROVOL].qflags & CM_VOLUME_QFLAG_IN_HASH)
cm_RemoveVolumeFromIDHashTable(volp, ROVOL);
volp->vol[ROVOL].ID = 0;
}
if (flags & VLF_BACKEXISTS) {
if (volp->vol[BACKVOL].ID != bkID) {
- if (volp->vol[BACKVOL].flags & CM_VOLUMEFLAG_IN_HASH)
+ if (volp->vol[BACKVOL].qflags & CM_VOLUME_QFLAG_IN_HASH)
cm_RemoveVolumeFromIDHashTable(volp, BACKVOL);
volp->vol[BACKVOL].ID = bkID;
cm_AddVolumeToIDHashTable(volp, BACKVOL);
}
} else {
- if (volp->vol[BACKVOL].flags & CM_VOLUMEFLAG_IN_HASH)
+ if (volp->vol[BACKVOL].qflags & CM_VOLUME_QFLAG_IN_HASH)
cm_RemoveVolumeFromIDHashTable(volp, BACKVOL);
volp->vol[BACKVOL].ID = 0;
}
for (i=0; i<nServers; i++) {
/* create a server entry */
tflags = serverFlags[i];
- if (tflags & VLSF_DONTUSE)
+ if (tflags & VLSF_DONTUSE)
continue;
tsockAddr.sin_port = htons(7000);
tsockAddr.sin_family = AF_INET;
tempAddr = htonl(serverNumber[i]);
tsockAddr.sin_addr.s_addr = tempAddr;
- tsp = cm_FindServer(&tsockAddr, CM_SERVER_FILE);
+ tsp = cm_FindServer(&tsockAddr, CM_SERVER_FILE, FALSE);
+#ifdef MULTIHOMED
if (tsp && (method == 2) && (tsp->flags & CM_SERVERFLAG_UUID)) {
- /*
+ /*
* Check to see if the uuid of the server we know at this address
* matches the uuid of the server we are being told about by the
* vlserver. If not, ...?
osi_LogSaveString(afsd_logp, hoststr));
}
}
+#endif
if (!tsp) {
/*
* cm_NewServer will probe the file server which in turn will
- * update the state on the volume group object
+ * update the state on the volume group object. Do not probe
+ * in this thread. It will block the thread and can result in
+ * a recursive call to cm_UpdateVolumeLocation().
*/
lock_ReleaseWrite(&volp->rw);
- tsp = cm_NewServer(&tsockAddr, CM_SERVER_FILE, cellp, &serverUUID[i], 0);
+ tsp = cm_NewServer(&tsockAddr, CM_SERVER_FILE, cellp, &serverUUID[i], CM_FLAG_NOPROBE);
lock_ObtainWrite(&volp->rw);
}
osi_assertx(tsp != NULL, "null cm_server_t");
-
+
/*
* if this server was created by fs setserverprefs
- * then it won't have either a cell assignment or
+ * then it won't have either a cell assignment or
* a server uuid.
*/
- if ( !tsp->cellp )
+ if ( !tsp->cellp )
tsp->cellp = cellp;
- if ( (method == 2) && !(tsp->flags & CM_SERVERFLAG_UUID) &&
+ if ( (method == 2) && !(tsp->flags & CM_SERVERFLAG_UUID) &&
!afs_uuid_is_nil(&serverUUID[i])) {
tsp->uuid = serverUUID[i];
- tsp->flags |= CM_SERVERFLAG_UUID;
+ _InterlockedOr(&tsp->flags, CM_SERVERFLAG_UUID);
}
/* and add it to the list(s). */
if ((tflags & VLSF_RWVOL) && (flags & VLF_RWEXISTS)) {
tsrp = cm_NewServerRef(tsp, rwID);
cm_InsertServerList(&volp->vol[RWVOL].serversp, tsrp);
-
- lock_ObtainWrite(&cm_serverLock);
- tsrp->refCount--; /* drop allocation reference */
- lock_ReleaseWrite(&cm_serverLock);
-
if (!(tsp->flags & CM_SERVERFLAG_DOWN))
rwServers_alldown = 0;
}
if ((tflags & VLSF_ROVOL) && (flags & VLF_ROEXISTS)) {
tsrp = cm_NewServerRef(tsp, roID);
cm_InsertServerList(&volp->vol[ROVOL].serversp, tsrp);
- lock_ObtainWrite(&cm_serverLock);
- tsrp->refCount--; /* drop allocation reference */
- lock_ReleaseWrite(&cm_serverLock);
ROcount++;
if (!(tsp->flags & CM_SERVERFLAG_DOWN))
roServers_alldown = 0;
}
/* We don't use VLSF_BACKVOL !?! */
- /* Because only the backup on the server holding the RW
+ /* Because only the backup on the server holding the RW
* volume can be valid. This check prevents errors if a
* RW is moved but the old backup is not removed.
*/
if ((tflags & VLSF_RWVOL) && (flags & VLF_BACKEXISTS)) {
tsrp = cm_NewServerRef(tsp, bkID);
cm_InsertServerList(&volp->vol[BACKVOL].serversp, tsrp);
- lock_ObtainWrite(&cm_serverLock);
- tsrp->refCount--; /* drop allocation reference */
- lock_ReleaseWrite(&cm_serverLock);
if (!(tsp->flags & CM_SERVERFLAG_DOWN))
bkServers_alldown = 0;
}
/* Drop the reference obtained by cm_FindServer() */
cm_PutServer(tsp);
- }
+ }
/*
* Randomize RO list
*
- * If the first n servers have the same ipRank, then we
+ * If the first n servers have the same ipRank, then we
* randomly pick one among them and move it to the beginning.
* We don't bother to re-order the whole list because
* the rest of the list is used only if the first server is
cm_RandomizeServer(&volp->vol[ROVOL].serversp);
}
-
rwNewstate = rwServers_alldown ? vl_alldown : vl_online;
roNewstate = roServers_alldown ? vl_alldown : vl_online;
bkNewstate = bkServers_alldown ? vl_alldown : vl_online;
- } else if (code == CM_ERROR_NOSUCHVOLUME || code == VL_NOENT || code == VL_BADNAME) {
- /* this volume does not exist - we should discard it */
- if (volp->flags & CM_VOLUMEFLAG_IN_HASH)
- cm_RemoveVolumeFromNameHashTable(volp);
- for ( volType = RWVOL; volType < NUM_VOL_TYPES; volType++) {
- if (volp->vol[volType].flags & CM_VOLUMEFLAG_IN_HASH)
- cm_RemoveVolumeFromIDHashTable(volp, volType);
- if (volp->vol[volType].ID) {
- cm_VolumeStatusNotification(volp, volp->vol[volType].ID, volp->vol[volType].state, vl_alldown);
- volp->vol[volType].ID = 0;
- }
- cm_SetFid(&volp->vol[volType].dotdotFid, 0, 0, 0, 0);
- }
-
- /* Move to the end so it will be recycled first */
- cm_MoveVolumeToLRULast(volp);
- volp->namep[0] ='\0';
+ _InterlockedAnd(&volp->flags, ~CM_VOLUMEFLAG_NOEXIST);
+ } else if (code == CM_ERROR_NOSUCHVOLUME || code == VL_NOENT || code == VL_BADNAME) {
+ _InterlockedOr(&volp->flags, CM_VOLUMEFLAG_NOEXIST);
} else {
rwNewstate = roNewstate = bkNewstate = vl_alldown;
}
volp->vol[BACKVOL].state = bkNewstate;
}
+ volp->lastUpdateTime = time(NULL);
+
if (code == 0)
- volp->flags &= ~CM_VOLUMEFLAG_RESET;
+ _InterlockedAnd(&volp->flags, ~CM_VOLUMEFLAG_RESET);
- volp->flags &= ~CM_VOLUMEFLAG_UPDATING_VL;
- osi_Log4(afsd_logp, "cm_UpdateVolumeLocation done, waking others name %s:%s flags 0x%x code 0x%x",
- osi_LogSaveString(afsd_logp,volp->cellp->name),
+ _InterlockedAnd(&volp->flags, ~CM_VOLUMEFLAG_UPDATING_VL);
+ osi_Log4(afsd_logp, "cm_UpdateVolumeLocation done, waking others name %s:%s flags 0x%x code 0x%x",
+ osi_LogSaveString(afsd_logp,volp->cellp->name),
osi_LogSaveString(afsd_logp,volp->namep), volp->flags, code);
osi_Wakeup((LONG_PTR) &volp->flags);
}
/* hold the volume if we found it */
- if (volp)
+ if (volp)
cm_GetVolume(volp);
-
+
lock_ReleaseRead(&cm_volumeLock);
return volp;
}
(unsigned) volumeID == volp->vol[ROVOL].ID ||
(unsigned) volumeID == volp->vol[BACKVOL].ID))
break;
- }
+ }
volp2 = volp;
#endif /* SEARCH_ALL_VOLUMES */
#endif
/* hold the volume if we found it */
- if (volp)
+ if (volp)
cm_GetVolume(volp);
-
+
lock_ReleaseRead(&cm_volumeLock);
/* return it held */
if (volp) {
lock_ObtainWrite(&volp->rw);
-
+
code = 0;
if ((volp->flags & CM_VOLUMEFLAG_RESET) && !(flags & CM_GETVOL_FLAG_NO_RESET)) {
code = cm_UpdateVolumeLocation(cellp, userp, reqp, volp);
}
return code;
}
-
+
/* otherwise, we didn't find it so consult the VLDB */
sprintf(volNameString, "%u", volumeID);
code = cm_FindVolumeByName(cellp, volNameString, userp, reqp,
flags | CM_GETVOL_FLAG_IGNORE_LINKED_CELL, outVolpp);
- if (code == CM_ERROR_NOSUCHVOLUME && cellp->linkedName[0] &&
+ if (code == CM_ERROR_NOSUCHVOLUME && cellp->linkedName[0] &&
!(flags & CM_GETVOL_FLAG_IGNORE_LINKED_CELL)) {
cm_cell_t *linkedCellp = cm_GetCell(cellp->linkedName, flags);
if (linkedCellp)
- code = cm_FindVolumeByID(linkedCellp, volumeID, userp, reqp,
- flags | CM_GETVOL_FLAG_IGNORE_LINKED_CELL,
+ code = cm_FindVolumeByID(linkedCellp, volumeID, userp, reqp,
+ flags | CM_GETVOL_FLAG_IGNORE_LINKED_CELL,
outVolpp);
}
return code;
if (cellp == volp->cellp && strcmp(name, volp->namep) == 0) {
break;
}
- }
+ }
volp2 = volp;
#endif /* SEARCH_ALL_VOLUMES */
afs_uint32 volType;
/* otherwise, get from VLDB */
- /*
+ /*
* Change to a write lock so that we have exclusive use of
- * the first cm_volume_t with a refCount of 0 so that we
+ * the first cm_volume_t with a refCount of 0 so that we
* have time to increment it.
*/
lock_ConvertRToW(&cm_volumeLock);
#else
for ( volp = cm_data.volumeLRULastp;
volp;
- volp = (cm_volume_t *) osi_QPrev(&volp->q))
+ volp = (cm_volume_t *) osi_QPrev(&volp->q))
{
if ( volp->refCount == 0 ) {
/* There is one we can re-use */
osi_Log2(afsd_logp, "Recycling Volume %s:%s",
volp->cellp->name, volp->namep);
- if (volp->flags & CM_VOLUMEFLAG_IN_LRU_QUEUE)
+ /* The volp is removed from the LRU queue in order to
+ * prevent two threads from attempting to recycle the
+ * same object. This volp must be re-inserted back into
+ * the LRU queue before this function exits.
+ */
+ if (volp->qflags & CM_VOLUME_QFLAG_IN_LRU_QUEUE)
cm_RemoveVolumeFromLRU(volp);
- if (volp->flags & CM_VOLUMEFLAG_IN_HASH)
+ if (volp->qflags & CM_VOLUME_QFLAG_IN_HASH)
cm_RemoveVolumeFromNameHashTable(volp);
for ( volType = RWVOL; volType < NUM_VOL_TYPES; volType++) {
- if (volp->vol[volType].flags & CM_VOLUMEFLAG_IN_HASH)
+ if (volp->vol[volType].qflags & CM_VOLUME_QFLAG_IN_HASH)
cm_RemoveVolumeFromIDHashTable(volp, volType);
if (volp->vol[volType].ID)
cm_VolumeStatusNotification(volp, volp->vol[volType].ID, volp->vol[volType].state, vl_unknown);
strncpy(volp->namep, name, VL_MAXNAMELEN);
volp->namep[VL_MAXNAMELEN-1] = '\0';
volp->flags = CM_VOLUMEFLAG_RESET;
-
+
for ( volType = RWVOL; volType < NUM_VOL_TYPES; volType++) {
volp->vol[volType].state = vl_unknown;
volp->vol[volType].nextp = NULL;
if (volp)
cm_GetVolume(volp);
lock_ReleaseRead(&cm_volumeLock);
-
+
if (!volp)
return CM_ERROR_NOSUCHVOLUME;
/* if we get here we are holding the mutex */
if ((volp->flags & CM_VOLUMEFLAG_RESET) && !(flags & CM_GETVOL_FLAG_NO_RESET)) {
code = cm_UpdateVolumeLocation(cellp, userp, reqp, volp);
- }
+ }
lock_ReleaseWrite(&volp->rw);
if (code == 0 && (type == BACKVOL && volp->vol[BACKVOL].ID == 0 ||
if (code == 0) {
*outVolpp = volp;
-
- if (!(flags & CM_GETVOL_FLAG_NO_LRU_UPDATE)) {
- lock_ObtainWrite(&cm_volumeLock);
+
+ lock_ObtainWrite(&cm_volumeLock);
+ if (!(volp->qflags & CM_VOLUME_QFLAG_IN_LRU_QUEUE) ||
+ (flags & CM_GETVOL_FLAG_NO_LRU_UPDATE))
cm_AdjustVolumeLRU(volp);
- lock_ReleaseWrite(&cm_volumeLock);
- }
+ lock_ReleaseWrite(&cm_volumeLock);
} else {
- lock_ObtainRead(&cm_volumeLock);
+ /*
+ * do not return it to the caller but do insert it in the LRU
+ * otherwise it will be lost
+ */
+ lock_ObtainWrite(&cm_volumeLock);
+ if (!(volp->qflags & CM_VOLUME_QFLAG_IN_LRU_QUEUE) ||
+ (flags & CM_GETVOL_FLAG_NO_LRU_UPDATE))
+ cm_AdjustVolumeLRU(volp);
cm_PutVolume(volp);
- lock_ReleaseRead(&cm_volumeLock);
+ lock_ReleaseWrite(&cm_volumeLock);
}
- if (code == CM_ERROR_NOSUCHVOLUME && cellp->linkedName[0] &&
+ if (code == CM_ERROR_NOSUCHVOLUME && cellp->linkedName[0] &&
!(flags & CM_GETVOL_FLAG_IGNORE_LINKED_CELL)) {
cm_cell_t *linkedCellp = cm_GetCell(cellp->linkedName, flags);
if (linkedCellp)
- code = cm_FindVolumeByName(linkedCellp, volumeNamep, userp, reqp,
- flags | CM_GETVOL_FLAG_IGNORE_LINKED_CELL,
+ code = cm_FindVolumeByName(linkedCellp, volumeNamep, userp, reqp,
+ flags | CM_GETVOL_FLAG_IGNORE_LINKED_CELL,
outVolpp);
}
return code;
-}
+}
-/*
+/*
* Only call this function in response to a VNOVOL or VMOVED error
* from a file server. Do not call it in response to CM_ERROR_NOSUCHVOLUME
* as that can lead to recursive calls.
afs_uint32 hash;
long code;
- if (!fidp)
+ if (!fidp)
return CM_ERROR_INVAL;
cellp = cm_FindCellByID(fidp->cell, 0);
- if (!cellp)
+ if (!cellp)
return CM_ERROR_NOSUCHCELL;
/* search for the volume */
fidp->volume == volp->vol[ROVOL].ID ||
fidp->volume == volp->vol[BACKVOL].ID))
break;
- }
+ }
#endif /* SEARCH_ALL_VOLUMES */
hash = CM_VOLUME_ID_HASH(fidp->volume);
osi_assertx(volp == volp2, "unexpected cm_vol_t");
#endif
/* hold the volume if we found it */
- if (volp)
+ if (volp)
cm_GetVolume(volp);
lock_ReleaseRead(&cm_volumeLock);
/* update it */
cm_data.mountRootGen = time(NULL);
lock_ObtainWrite(&volp->rw);
- volp->flags |= CM_VOLUMEFLAG_RESET;
+ _InterlockedOr(&volp->flags, CM_VOLUMEFLAG_RESET);
code = cm_UpdateVolumeLocation(cellp, userp, reqp, volp);
lock_ReleaseWrite(&volp->rw);
afs_int32 code;
firstTry = 0;
lock_ObtainWrite(&volp->rw);
- volp->flags |= CM_VOLUMEFLAG_RESET;
+ _InterlockedOr(&volp->flags, CM_VOLUMEFLAG_RESET);
code = cm_UpdateVolumeLocation(volp->cellp, userp, reqp, volp);
lock_ReleaseWrite(&volp->rw);
if (code == 0)
return NULL;
}
- /*
+ /*
* Increment the refCount on deleted items as well.
- * They will be freed by cm_FreeServerList when they get to zero
+ * They will be freed by cm_FreeServerList when they get to zero
*/
- for (current = *serverspp; current; current = current->next)
- current->refCount++;
+ for (current = *serverspp; current; current = current->next)
+ cm_GetServerRef(current, TRUE);
lock_ReleaseWrite(&cm_serverLock);
return id;
}
-void cm_RefreshVolumes(void)
+void cm_RefreshVolumes(int lifetime)
{
cm_volume_t *volp;
- cm_scache_t *scp;
afs_int32 refCount;
+ time_t now;
- cm_data.mountRootGen = time(NULL);
+ now = time(NULL);
- /* force a re-loading of volume data from the vldb */
+ /* force mount point target updates */
+ if (cm_data.mountRootGen + lifetime <= now)
+ cm_data.mountRootGen = now;
+
+ /*
+ * force a re-loading of volume data from the vldb
+ * if the lifetime for the cached data has expired
+ */
lock_ObtainRead(&cm_volumeLock);
for (volp = cm_data.allVolumesp; volp; volp=volp->allNextp) {
InterlockedIncrement(&volp->refCount);
lock_ReleaseRead(&cm_volumeLock);
- lock_ObtainWrite(&volp->rw);
- volp->flags |= CM_VOLUMEFLAG_RESET;
- lock_ReleaseWrite(&volp->rw);
-
+ if (!(volp->flags & CM_VOLUMEFLAG_RESET)) {
+ lock_ObtainWrite(&volp->rw);
+ if (volp->lastUpdateTime + lifetime <= now)
+ _InterlockedOr(&volp->flags, CM_VOLUMEFLAG_RESET);
+ lock_ReleaseWrite(&volp->rw);
+ }
+
lock_ObtainRead(&cm_volumeLock);
refCount = InterlockedDecrement(&volp->refCount);
osi_assertx(refCount >= 0, "cm_volume_t refCount underflow");
}
lock_ReleaseRead(&cm_volumeLock);
-
- /* force mount points to be re-evaluated so that
- * if the volume location has changed we will pick
- * that up
- */
- for ( scp = cm_data.scacheLRUFirstp;
- scp;
- scp = (cm_scache_t *) osi_QNext(&scp->q)) {
- if ( scp->fileType == CM_SCACHETYPE_MOUNTPOINT
-#ifdef AFS_FREELANCE_CLIENT
- && !(scp->fid.cell == AFS_FAKE_ROOT_CELL_ID && scp->fid.volume == AFS_FAKE_ROOT_VOL_ID)
-#endif
- ) {
- lock_ObtainWrite(&scp->rw);
- scp->mountPointStringp[0] = '\0';
- lock_ReleaseWrite(&scp->rw);
- }
- }
-
}
void
char motd[256];
long alldown, alldeleted;
cm_serverRef_t *serversp;
+ cm_fid_t fid;
Name = volName;
OfflineMsg = offLineMsg;
MOTD = motd;
if (statep->ID != 0 && (!volID || volID == statep->ID)) {
+ /* create fid for volume root so that VNOVOL and VMOVED errors can be processed */
+ cm_SetFid(&fid, volp->cellp->cellID, statep->ID, 1, 1);
+
if (!statep->serversp && !(*volumeUpdatedp)) {
cm_InitReq(&req);
code = cm_UpdateVolumeLocation(volp->cellp, cm_rootUserp, &req, volp);
*volumeUpdatedp = 1;
}
+ lock_ObtainRead(&cm_serverLock);
if (statep->serversp) {
alldown = 1;
alldeleted = 1;
alldeleted = 0;
*onlinep = 1;
alldown = 0;
-
+
if (serversp->status == srv_busy || serversp->status == srv_offline)
serversp->status = srv_not_busy;
}
+ lock_ReleaseRead(&cm_serverLock);
if (alldeleted && !(*volumeUpdatedp)) {
cm_InitReq(&req);
if (statep->state == vl_busy || statep->state == vl_offline || statep->state == vl_unknown ||
(!alldown && statep->state == vl_alldown)) {
cm_InitReq(&req);
+ req.flags |= CM_REQ_OFFLINE_VOL_CHK;
lock_ReleaseWrite(&volp->rw);
do {
code = cm_ConnFromVolume(volp, statep->ID, cm_rootUserp, &req, &connp);
- if (code)
+ if (code)
continue;
rxconnp = cm_GetRxConn(connp);
code = RXAFS_GetVolumeStatus(rxconnp, statep->ID,
&volStat, &Name, &OfflineMsg, &MOTD);
- rx_PutConnection(rxconnp);
-
- } while (cm_Analyze(connp, cm_rootUserp, &req, NULL, NULL, NULL, NULL, code));
+ rx_PutConnection(rxconnp);
+ } while (cm_Analyze(connp, cm_rootUserp, &req, &fid, NULL, NULL, NULL, code));
code = cm_MapRPCError(code, &req);
lock_ObtainWrite(&volp->rw);
cm_VolumeStatusNotification(volp, statep->ID, statep->state, vl_alldown);
statep->state = vl_alldown;
}
- } else if (statep->state != vl_alldown) {
- cm_VolumeStatusNotification(volp, statep->ID, statep->state, vl_alldown);
- statep->state = vl_alldown;
+ } else {
+ lock_ReleaseRead(&cm_serverLock);
+ if (statep->state != vl_alldown) {
+ cm_VolumeStatusNotification(volp, statep->ID, statep->state, vl_alldown);
+ statep->state = vl_alldown;
+ }
}
}
}
-/* The return code is 0 if the volume is not online and
+/* The return code is 0 if the volume is not online and
* 1 if the volume is online
*/
long
}
-/*
+/*
* called from the Daemon thread.
* when checking the offline status, check those of the most recently used volumes first.
*/
extern int powerStateSuspended;
lock_ObtainRead(&cm_volumeLock);
- for (volp = cm_data.volumeLRULastp;
- volp && !daemon_ShutdownFlag && !powerStateSuspended;
+ for (volp = cm_data.volumeLRULastp;
+ volp && !daemon_ShutdownFlag && !powerStateSuspended;
volp=(cm_volume_t *) osi_QPrev(&volp->q)) {
- if (volp->flags & CM_VOLUMEFLAG_IN_HASH) {
+ /*
+ * Skip volume entries that did not exist last time
+ * the vldb was queried. For those entries wait until
+ * the next actual request is received for the volume
+ * before checking its state.
+ */
+ if ((volp->qflags & CM_VOLUME_QFLAG_IN_HASH) &&
+ !(volp->flags & CM_VOLUMEFLAG_NOEXIST)) {
InterlockedIncrement(&volp->refCount);
lock_ReleaseRead(&cm_volumeLock);
cm_CheckOfflineVolume(volp, 0);
lock_ObtainWrite(&cm_serverLock);
for (tsrp = statep->serversp; tsrp; tsrp=tsrp->next) {
tsp = tsrp->server;
- sprintf(addr, "%d.%d.%d.%d",
+ sprintf(addr, "%d.%d.%d.%d",
((tsp->addr.sin_addr.s_addr & 0xff)),
((tsp->addr.sin_addr.s_addr & 0xff00)>> 8),
((tsp->addr.sin_addr.s_addr & 0xff0000)>> 16),
- ((tsp->addr.sin_addr.s_addr & 0xff000000)>> 24));
+ ((tsp->addr.sin_addr.s_addr & 0xff000000)>> 24));
if (tsrp->status == srv_deleted) {
- osi_Log2(afsd_logp, "cm_UpdateVolumeStatusInt volume %d server reference %s deleted",
+ osi_Log2(afsd_logp, "cm_UpdateVolumeStatusInt volume %d server reference %s deleted",
statep->ID, osi_LogSaveString(afsd_logp,addr));
continue;
}
if (!(tsp->flags & CM_SERVERFLAG_DOWN)) {
allDown = 0;
if (tsrp->status == srv_busy) {
- osi_Log2(afsd_logp, "cm_UpdateVolumeStatusInt volume %d server reference %s busy",
+ osi_Log2(afsd_logp, "cm_UpdateVolumeStatusInt volume %d server reference %s busy",
statep->ID, osi_LogSaveString(afsd_logp,addr));
allOffline = 0;
someBusy = 1;
} else if (tsrp->status == srv_offline) {
- osi_Log2(afsd_logp, "cm_UpdateVolumeStatusInt volume %d server reference %s offline",
+ osi_Log2(afsd_logp, "cm_UpdateVolumeStatusInt volume %d server reference %s offline",
statep->ID, osi_LogSaveString(afsd_logp,addr));
allBusy = 0;
someOffline = 1;
} else {
- osi_Log2(afsd_logp, "cm_UpdateVolumeStatusInt volume %d server reference %s online",
+ osi_Log2(afsd_logp, "cm_UpdateVolumeStatusInt volume %d server reference %s online",
statep->ID, osi_LogSaveString(afsd_logp,addr));
allOffline = 0;
allBusy = 0;
}
} else {
- osi_Log2(afsd_logp, "cm_UpdateVolumeStatusInt volume %d server reference %s down",
+ osi_Log2(afsd_logp, "cm_UpdateVolumeStatusInt volume %d server reference %s down",
statep->ID, osi_LogSaveString(afsd_logp,addr));
}
cm_PutServerNoLock(tsp);
}
- }
+ }
lock_ReleaseWrite(&cm_serverLock);
- osi_Log5(afsd_logp, "cm_UpdateVolumeStatusInt allDown %d allBusy %d someBusy %d someOffline %d allOffline %d",
+ osi_Log5(afsd_logp, "cm_UpdateVolumeStatusInt allDown %d allBusy %d someBusy %d someOffline %d allOffline %d",
allDown, allBusy, someBusy, someOffline, allOffline);
if (allDown)
newStatus = vl_alldown;
- else if (allBusy || (someBusy && someOffline))
+ else if (allBusy || (someBusy && someOffline))
newStatus = vl_busy;
else if (allOffline)
newStatus = vl_offline;
/*
* If we are called with volID == 0 then something has gone wrong.
* Most likely a race occurred in the server volume list maintenance.
- * Since we don't know which volume's status should be updated,
- * just update all of them that are known to exist. Better to be
+ * Since we don't know which volume's status should be updated,
+ * just update all of them that are known to exist. Better to be
* correct than fast.
*/
afs_uint32 volType;
** RO list according to the changed rank of server.
*/
void cm_ChangeRankVolume(cm_server_t *tsp)
-{
+{
int code;
cm_volume_t* volp;
afs_int32 refCount;
osi_assertx(refCount >= 0, "cm_volume_t refCount underflow");
}
lock_ReleaseRead(&cm_volumeLock);
-}
+}
-/* dump all volumes that have reference count > 0 to a file.
- * cookie is used to identify this batch for easy parsing,
- * and it a string provided by a caller
+/* dump all volumes that have reference count > 0 to a file.
+ * cookie is used to identify this batch for easy parsing,
+ * and it a string provided by a caller
*/
int cm_DumpVolumes(FILE *outputFile, char *cookie, int lock)
{
int zilch;
cm_volume_t *volp;
char output[1024];
-
+
if (lock) {
lock_ObtainRead(&cm_scacheLock);
lock_ObtainRead(&cm_volumeLock);
}
-
+
sprintf(output, "%s - dumping volumes - cm_data.currentVolumes=%d, cm_data.maxVolumes=%d\r\n",
cookie, cm_data.currentVolumes, cm_data.maxVolumes);
WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
-
+
for (volp = cm_data.allVolumesp; volp; volp=volp->allNextp)
{
time_t t;
if (volp->cbServerpRO) {
if (!((volp->cbServerpRO->flags & CM_SERVERFLAG_UUID) &&
UuidToString((UUID *)&volp->cbServerpRO->uuid, &srvStr) == RPC_S_OK)) {
- afs_asprintf(&srvStr, "%.0I", volp->cbServerpRO->addr.sin_addr.s_addr);
+ srvStr = malloc(16);
+ if (srvStr != NULL)
+ afs_inet_ntoa_r(volp->cbServerpRO->addr.sin_addr.s_addr, srvStr);
srvStrRpc = FALSE;
}
}
}
sprintf(output,
- "%s - volp=0x%p cell=%s name=%s rwID=%u roID=%u bkID=%u flags=0x%x "
+ "%s - volp=0x%p cell=%s name=%s rwID=%u roID=%u bkID=%u flags=0x%x:%x "
"cbServerpRO='%s' cbExpiresRO='%s' creationDateRO='%s' refCount=%u\r\n",
cookie, volp, volp->cellp->name, volp->namep, volp->vol[RWVOL].ID,
- volp->vol[ROVOL].ID, volp->vol[BACKVOL].ID, volp->flags,
+ volp->vol[ROVOL].ID, volp->vol[BACKVOL].ID, volp->flags, volp->qflags,
srvStr ? srvStr : "<none>", cbt ? cbt : "<none>", cdrot ? cdrot : "<none>",
volp->refCount);
WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
}
sprintf(output, "%s - Done dumping volumes.\r\n", cookie);
WriteFile(outputFile, output, (DWORD)strlen(output), &zilch, NULL);
-
+
if (lock) {
lock_ReleaseRead(&cm_volumeLock);
lock_ReleaseRead(&cm_scacheLock);
}
- return (0);
+ return (0);
}
-/*
+/*
* String hash function used by SDBM project.
* It was chosen because it is fast and provides
* decent coverage.
void cm_AddVolumeToNameHashTable(cm_volume_t *volp)
{
int i;
-
- if (volp->flags & CM_VOLUMEFLAG_IN_HASH)
+
+ if (volp->qflags & CM_VOLUME_QFLAG_IN_HASH)
return;
i = CM_VOLUME_NAME_HASH(volp->namep);
volp->nameNextp = cm_data.volumeNameHashTablep[i];
cm_data.volumeNameHashTablep[i] = volp;
- volp->flags |= CM_VOLUMEFLAG_IN_HASH;
+ _InterlockedOr(&volp->qflags, CM_VOLUME_QFLAG_IN_HASH);
}
/* call with volume write-locked and mutex held */
cm_volume_t **lvolpp;
cm_volume_t *tvolp;
int i;
-
- if (volp->flags & CM_VOLUMEFLAG_IN_HASH) {
+
+ if (volp->qflags & CM_VOLUME_QFLAG_IN_HASH) {
/* hash it out first */
i = CM_VOLUME_NAME_HASH(volp->namep);
for (lvolpp = &cm_data.volumeNameHashTablep[i], tvolp = cm_data.volumeNameHashTablep[i];
lvolpp = &tvolp->nameNextp, tvolp = tvolp->nameNextp) {
if (tvolp == volp) {
*lvolpp = volp->nameNextp;
- volp->flags &= ~CM_VOLUMEFLAG_IN_HASH;
+ _InterlockedAnd(&volp->qflags, ~CM_VOLUME_QFLAG_IN_HASH);
volp->nameNextp = NULL;
break;
}
statep = cm_VolumeStateByType(volp, volType);
- if (statep->flags & CM_VOLUMEFLAG_IN_HASH)
+ if (statep->qflags & CM_VOLUME_QFLAG_IN_HASH)
return;
i = CM_VOLUME_ID_HASH(statep->ID);
statep->nextp = cm_data.volumeRWIDHashTablep[i];
cm_data.volumeRWIDHashTablep[i] = volp;
break;
- case ROVOL:
+ case ROVOL:
statep->nextp = cm_data.volumeROIDHashTablep[i];
cm_data.volumeROIDHashTablep[i] = volp;
break;
cm_data.volumeBKIDHashTablep[i] = volp;
break;
}
- statep->flags |= CM_VOLUMEFLAG_IN_HASH;
+ _InterlockedOr(&statep->qflags, CM_VOLUME_QFLAG_IN_HASH);
}
cm_volume_t *tvolp;
struct cm_vol_state * statep;
int i;
-
+
statep = cm_VolumeStateByType(volp, volType);
- if (statep->flags & CM_VOLUMEFLAG_IN_HASH) {
+ if (statep->qflags & CM_VOLUME_QFLAG_IN_HASH) {
/* hash it out first */
i = CM_VOLUME_ID_HASH(statep->ID);
do {
if (tvolp == volp) {
*lvolpp = statep->nextp;
- statep->flags &= ~CM_VOLUMEFLAG_IN_HASH;
+ _InterlockedAnd(&statep->qflags, ~CM_VOLUME_QFLAG_IN_HASH);
statep->nextp = NULL;
break;
}
/* must be called with cm_volumeLock write-locked! */
void cm_AdjustVolumeLRU(cm_volume_t *volp)
{
- if (volp == cm_data.volumeLRULastp)
- cm_data.volumeLRULastp = (cm_volume_t *) osi_QPrev(&volp->q);
- if (volp->flags & CM_VOLUMEFLAG_IN_LRU_QUEUE)
+ lock_AssertWrite(&cm_volumeLock);
+
+ if (volp == cm_data.volumeLRUFirstp)
+ return;
+
+ if (volp->qflags & CM_VOLUME_QFLAG_IN_LRU_QUEUE)
osi_QRemoveHT((osi_queue_t **) &cm_data.volumeLRUFirstp, (osi_queue_t **) &cm_data.volumeLRULastp, &volp->q);
- osi_QAdd((osi_queue_t **) &cm_data.volumeLRUFirstp, &volp->q);
- volp->flags |= CM_VOLUMEFLAG_IN_LRU_QUEUE;
- if (!cm_data.volumeLRULastp)
- cm_data.volumeLRULastp = volp;
+ osi_QAddH((osi_queue_t **) &cm_data.volumeLRUFirstp, (osi_queue_t **) &cm_data.volumeLRULastp, &volp->q);
+ _InterlockedOr(&volp->qflags, CM_VOLUME_QFLAG_IN_LRU_QUEUE);
+
+ osi_assertx(cm_data.volumeLRULastp != NULL, "null cm_data.volumeLRULastp");
}
/* must be called with cm_volumeLock write-locked! */
void cm_MoveVolumeToLRULast(cm_volume_t *volp)
{
+ lock_AssertWrite(&cm_volumeLock);
+
if (volp == cm_data.volumeLRULastp)
return;
- if (volp == cm_data.volumeLRUFirstp)
- cm_data.volumeLRUFirstp = (cm_volume_t *) osi_QNext(&volp->q);
- if (volp->flags & CM_VOLUMEFLAG_IN_LRU_QUEUE)
+ if (volp->qflags & CM_VOLUME_QFLAG_IN_LRU_QUEUE)
osi_QRemoveHT((osi_queue_t **) &cm_data.volumeLRUFirstp, (osi_queue_t **) &cm_data.volumeLRULastp, &volp->q);
osi_QAddT((osi_queue_t **) &cm_data.volumeLRUFirstp, (osi_queue_t **) &cm_data.volumeLRULastp, &volp->q);
- volp->flags |= CM_VOLUMEFLAG_IN_LRU_QUEUE;
- if (!cm_data.volumeLRULastp)
- cm_data.volumeLRULastp = volp;
+ _InterlockedOr(&volp->qflags, CM_VOLUME_QFLAG_IN_LRU_QUEUE);
+
+ osi_assertx(cm_data.volumeLRULastp != NULL, "null cm_data.volumeLRULastp");
}
/* must be called with cm_volumeLock write-locked! */
void cm_RemoveVolumeFromLRU(cm_volume_t *volp)
{
- if (volp->flags & CM_VOLUMEFLAG_IN_LRU_QUEUE) {
- if (volp == cm_data.volumeLRULastp)
- cm_data.volumeLRULastp = (cm_volume_t *) osi_QPrev(&volp->q);
+ lock_AssertWrite(&cm_volumeLock);
+
+ if (volp->qflags & CM_VOLUME_QFLAG_IN_LRU_QUEUE) {
osi_QRemoveHT((osi_queue_t **) &cm_data.volumeLRUFirstp, (osi_queue_t **) &cm_data.volumeLRULastp, &volp->q);
- volp->flags &= ~CM_VOLUMEFLAG_IN_LRU_QUEUE;
+ _InterlockedAnd(&volp->qflags, ~CM_VOLUME_QFLAG_IN_LRU_QUEUE);
}
+
+ osi_assertx(cm_data.volumeLRULastp != NULL, "null cm_data.volumeLRULastp");
}
static char * volstatus_str(enum volstatus vs)
osi_LogSaveString(afsd_logp, volstr), volID, volstatus_str(old), volstatus_str(new));
cm_VolStatus_Change_Notification(volp->cellp->cellID, volID, new);
-}
+}
enum volstatus cm_GetVolumeStatus(cm_volume_t *volp, afs_uint32 volID)
{
/* Renew .readonly volume callbacks that are more than
* 30 minutes old. (A volume callback is issued for 2 hours.)
*/
-void
+void
cm_VolumeRenewROCallbacks(void)
{
cm_volume_t * volp;
lock_ReleaseRead(&cm_volumeLock);
}
-cm_vol_state_t *
+cm_vol_state_t *
cm_VolumeStateByType(cm_volume_t *volp, afs_uint32 volType)
{
return &volp->vol[volType];
}
-cm_vol_state_t *
+cm_vol_state_t *
cm_VolumeStateByID(cm_volume_t *volp, afs_uint32 id)
{
cm_vol_state_t * statep = NULL;
return(statep);
}
-cm_vol_state_t *
+cm_vol_state_t *
cm_VolumeStateByName(cm_volume_t *volp, char *volname)
{
size_t len = strlen(volname);
statep = &volp->vol[ROVOL];
else if (cm_stricmp_utf8N(".backup", &volname[len-7]) == 0)
statep = &volp->vol[BACKVOL];
- else
+ else
statep = &volp->vol[RWVOL];
return statep;
}
-afs_int32
+afs_int32
cm_VolumeType(cm_volume_t *volp, afs_uint32 id)
{
if (id == volp->vol[RWVOL].ID)
git://git.openafs.org / openafs.git / blobdiff