cm_fid_t tfid;
cm_scache_t *dscp;
- tfid.cell = scp->fid.cell;
- tfid.volume = scp->fid.volume;
- tfid.vnode = scp->parentVnode;
- tfid.unique = scp->parentUnique;
+ cm_SetFid(&tfid, scp->fid.cell, scp->fid.volume, scp->parentVnode, scp->parentUnique);
dscp = cm_FindSCache(&tfid);
#ifndef AFSIFS
if ( dscp &&
osi_Log4(afsd_logp, "RevokeCallback Discarding SCache scp 0x%p vol %u vn %u uniq %u",
scp, scp->fid.volume, scp->fid.vnode, scp->fid.unique);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
cm_DiscardSCache(scp);
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
cm_CallbackNotifyChange(scp);
cm_HoldSCacheNoLock(scp);
lock_ReleaseWrite(&cm_scacheLock);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
osi_Log4(afsd_logp, "RevokeVolumeCallback Discarding SCache scp 0x%p vol %u vn %u uniq %u",
scp, scp->fid.volume, scp->fid.vnode, scp->fid.unique);
cm_DiscardSCache(scp);
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
cm_CallbackNotifyChange(scp);
lock_ObtainWrite(&cm_scacheLock);
cm_ReleaseSCacheNoLock(scp);
-
- if (scp->flags & CM_SCACHEFLAG_PURERO && scp->volp) {
- scp->volp->cbExpiresRO = 0;
+ if (scp->flags & CM_SCACHEFLAG_PURERO) {
+ cm_volume_t *volp = cm_GetVolumeByFID(&scp->fid);
+ if (volp) {
+ volp->cbExpiresRO = 0;
+ cm_PutVolume(volp);
+ }
}
-
}
} /* search one hash bucket */
} /* search all hash buckets */
unsigned long host = 0;
unsigned short port = 0;
cm_server_t *tsp = NULL;
- cm_cell_t * cellp = NULL;
-
- MUTEX_ENTER(&callp->lock);
+ cm_cell_t* cellp = NULL;
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
tsp = cm_FindServerByIP(host, CM_SERVER_FILE);
if (tsp)
cellp = tsp->cellp;
+
+ if (!cellp)
+ osi_Log2(afsd_logp, "SRXAFSCB_CallBack from host 0x%x port %d",
+ ntohl(host),
+ ntohs(port));
+ else
+ osi_Log3(afsd_logp, "SRXAFSCB_CallBack from host 0x%x port %d for cell %s",
+ ntohl(host),
+ ntohs(port),
+ cellp->name /* does not need to be saved, doesn't change */);
+ } else {
+ osi_Log0(afsd_logp, "SRXAFSCB_CallBack from unknown host");
}
- osi_Log2(afsd_logp, "SRXAFSCB_CallBack from host 0x%x port %d",
- ntohl(host),
- ntohs(port));
for (i=0; i < (long) fidsArrayp->AFSCBFids_len; i++) {
tfidp = &fidsArrayp->AFSCBFids_val[i];
else
cm_RevokeCallback(callp, cellp, tfidp);
}
-
- MUTEX_EXIT(&callp->lock);
return 0;
}
unsigned long host = 0;
unsigned short port = 0;
- MUTEX_ENTER(&callp->lock);
-
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) {
cm_HoldSCacheNoLock(scp);
lock_ReleaseWrite(&cm_scacheLock);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
discarded = 0;
if (scp->cbExpires > 0 && scp->cbServerp != NULL) {
/* we have a callback, now decide if we should clear it */
discarded = 1;
}
}
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
if (discarded)
cm_CallbackNotifyChange(scp);
lock_ObtainWrite(&cm_scacheLock);
cm_ReleaseSCacheNoLock(scp);
- if (discarded && (scp->flags & CM_SCACHEFLAG_PURERO) && scp->volp && scp->volp->cbExpiresRO != 0)
- scp->volp->cbExpiresRO = 0;
+ if (discarded && (scp->flags & CM_SCACHEFLAG_PURERO)) {
+ cm_volume_t *volp = cm_GetVolumeByFID(&scp->fid);
+ if (volp) {
+ if (volp->cbExpiresRO != 0)
+ volp->cbExpiresRO = 0;
+ cm_PutVolume(volp);
+ }
+ }
} /* search one hash bucket */
} /* search all hash buckets */
cm_PutServer(tsp);
}
}
- MUTEX_EXIT(&callp->lock);
return 0;
}
unsigned long host = 0;
unsigned short port = 0;
- MUTEX_ENTER(&callp->lock);
-
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
ntohl(host),
ntohs(port));
- MUTEX_EXIT(&callp->lock);
return 0;
}
extern osi_rwlock_t cm_aclLock;
extern osi_rwlock_t buf_globalLock;
-extern osi_rwlock_t cm_callbackLock;
extern osi_rwlock_t cm_cellLock;
extern osi_rwlock_t cm_connLock;
extern osi_rwlock_t cm_daemonLock;
extern osi_rwlock_t cm_dnlcLock;
extern osi_rwlock_t cm_scacheLock;
extern osi_rwlock_t cm_serverLock;
+extern osi_rwlock_t cm_syscfgLock;
extern osi_rwlock_t cm_userLock;
extern osi_rwlock_t cm_utilsLock;
extern osi_rwlock_t cm_volumeLock;
{"buf_globalLock", (char*)&buf_globalLock, LOCKTYPE_RW},
{"cm_serverLock", (char*)&cm_serverLock, LOCKTYPE_RW},
{"cm_callbackLock", (char*)&cm_callbackLock, LOCKTYPE_RW},
+ {"cm_syscfgLock", (char*)&cm_syscfgLock, LOCKTYPE_RW},
{"cm_aclLock", (char*)&cm_aclLock, LOCKTYPE_RW},
{"cm_cellLock", (char*)&cm_cellLock, LOCKTYPE_RW},
{"cm_connLock", (char*)&cm_connLock, LOCKTYPE_RW},
unsigned long host = 0;
unsigned short port = 0;
- MUTEX_ENTER(&callp->lock);
-
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
code = 0;
}
- MUTEX_EXIT(&callp->lock);
return code;
}
unsigned long host = 0;
unsigned short port = 0;
- MUTEX_ENTER(&callp->lock);
-
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
cep->netFid.Vnode = scp->fid.vnode;
cep->netFid.Unique = scp->fid.unique;
cep->lock.waitStates = 0;
- cep->lock.exclLocked = scp->mx.flags;
+ cep->lock.exclLocked = scp->rw.flags;
cep->lock.readersReading = 0;
- cep->lock.numWaiting = scp->mx.waiters;
+ cep->lock.numWaiting = scp->rw.waiters;
cep->lock.pid_last_reader = 0;
cep->lock.pid_writer = 0;
cep->lock.src_indicator = 0;
cep->Length = scp->length.LowPart;
cep->DataVersion = (afs_uint32)(scp->dataVersion & 0xFFFFFFFF);
cep->callback = afs_data_pointer_to_int32(scp->cbServerp);
- if (scp->flags & CM_SCACHEFLAG_PURERO && scp->volp)
- cep->cbExpires = scp->volp->cbExpiresRO;
- else
+ if (scp->flags & CM_SCACHEFLAG_PURERO) {
+ cm_volume_t *volp = cm_GetVolumeByFID(&scp->fid);
+ if (volp) {
+ cep->cbExpires = volp->cbExpiresRO;
+ cm_PutVolume(volp);
+ }
+ } else
cep->cbExpires = scp->cbExpires;
cep->refCount = scp->refCount;
cep->opens = scp->openReads;
fcnDone:
lock_ReleaseRead(&cm_scacheLock);
- MUTEX_EXIT(&callp->lock);
return (code);
}
unsigned long host = 0;
unsigned short port = 0;
- MUTEX_ENTER(&callp->lock);
-
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
cep->netFid.Vnode = scp->fid.vnode;
cep->netFid.Unique = scp->fid.unique;
cep->lock.waitStates = 0;
- cep->lock.exclLocked = scp->mx.flags;
+ cep->lock.exclLocked = scp->rw.flags;
cep->lock.readersReading = 0;
- cep->lock.numWaiting = scp->mx.waiters;
+ cep->lock.numWaiting = scp->rw.waiters;
cep->lock.pid_last_reader = 0;
cep->lock.pid_writer = 0;
cep->lock.src_indicator = 0;
#endif
cep->DataVersion = (afs_uint32)(scp->dataVersion & 0xFFFFFFFF);
cep->callback = afs_data_pointer_to_int32(scp->cbServerp);
- if (scp->flags & CM_SCACHEFLAG_PURERO && scp->volp)
- cep->cbExpires = scp->volp->cbExpiresRO;
- else
+ if (scp->flags & CM_SCACHEFLAG_PURERO) {
+ cm_volume_t *volp = cm_GetVolumeByFID(&scp->fid);
+ if (volp) {
+ cep->cbExpires = volp->cbExpiresRO;
+ cm_PutVolume(volp);
+ }
+ } else
cep->cbExpires = scp->cbExpires;
cep->refCount = scp->refCount;
cep->opens = scp->openReads;
fcnDone:
lock_ReleaseRead(&cm_scacheLock);
- MUTEX_EXIT(&callp->lock);
return (code);
}
unsigned long host = 0;
unsigned short port = 0;
- MUTEX_ENTER(&callp->lock);
-
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
ntohl(host), ntohs(port));
*vp = -1;
- MUTEX_EXIT(&callp->lock);
return RXGEN_OPCODE;
}
unsigned long host = 0;
unsigned short port = 0;
- MUTEX_ENTER(&callp->lock);
-
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
osi_Log2(afsd_logp, "SRXAFSCB_GetXStats from host 0x%x port %d - not implemented",
ntohl(host), ntohs(port));
- MUTEX_EXIT(&callp->lock);
return RXGEN_OPCODE;
}
SRXAFSCB_WhoAreYou(struct rx_call *callp, struct interfaceAddr* addr)
{
int i;
- int cm_noIPAddr; /* number of client network interfaces */
- int cm_IPAddr[CM_MAXINTERFACE_ADDR]; /* client's IP address in host order */
- int cm_SubnetMask[CM_MAXINTERFACE_ADDR];/* client's subnet mask in host order*/
- int cm_NetMtu[CM_MAXINTERFACE_ADDR]; /* client's MTU sizes */
- int cm_NetFlags[CM_MAXINTERFACE_ADDR]; /* network flags */
long code;
struct rx_connection *connp;
struct rx_peer *peerp;
unsigned long host = 0;
unsigned short port = 0;
- MUTEX_ENTER(&callp->lock);
-
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
}
- /* get network related info */
- cm_noIPAddr = CM_MAXINTERFACE_ADDR;
- code = syscfg_GetIFInfo(&cm_noIPAddr,
- cm_IPAddr, cm_SubnetMask,
- cm_NetMtu, cm_NetFlags);
-
- /* return all network interface addresses */
osi_Log2(afsd_logp, "SRXAFSCB_WhoAreYou from host 0x%x port %d",
ntohl(host),
ntohs(port));
+ lock_ObtainRead(&cm_syscfgLock);
+ if (cm_LanAdapterChangeDetected) {
+ lock_ConvertRToW(&cm_syscfgLock);
+ if (cm_LanAdapterChangeDetected) {
+ /* get network related info */
+ cm_noIPAddr = CM_MAXINTERFACE_ADDR;
+ code = syscfg_GetIFInfo(&cm_noIPAddr,
+ cm_IPAddr, cm_SubnetMask,
+ cm_NetMtu, cm_NetFlags);
+ cm_LanAdapterChangeDetected = 0;
+ }
+ lock_ConvertWToR(&cm_syscfgLock);
+ }
+
+ /* return all network interface addresses */
addr->numberOfInterfaces = cm_noIPAddr;
addr->uuid = cm_data.Uuid;
for ( i=0; i < cm_noIPAddr; i++ ) {
cm_NetMtu[i] : rx_mtu;
}
- MUTEX_EXIT(&callp->lock);
+ lock_ReleaseRead(&cm_syscfgLock);
+
return 0;
}
char *p = NULL;
if (UuidToString((UUID *)serverUuid, &p) == RPC_S_OK) {
- osi_Log1(afsd_logp, "SRXAFSCB_InitCallBackState3 %s ->",p);
+ osi_Log1(afsd_logp, "SRXAFSCB_InitCallBackState3 %s ->",osi_LogSaveString(afsd_logp,p));
RpcStringFree(&p);
} else
osi_Log0(afsd_logp, "SRXAFSCB_InitCallBackState3 - no server Uuid ->");
char *p,*q;
int code = 0;
- MUTEX_ENTER(&callp->lock);
-
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
ntohl(host),
ntohs(port));
- MUTEX_EXIT(&callp->lock);
return code;
}
/* debug interface */
-int
-SRXAFSCB_GetCellByNum(struct rx_call *callp, afs_int32 a_cellnum,
- char **a_name, serverList *a_hosts)
+static int
+GetCellCommon(afs_int32 a_cellnum, char **a_name, serverList *a_hosts)
{
afs_int32 sn;
cm_cell_t * cellp;
cm_serverRef_t * serverRefp;
- struct rx_connection *connp;
- struct rx_peer *peerp;
- unsigned long host = 0;
- unsigned short port = 0;
-
- MUTEX_ENTER(&callp->lock);
-
- if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
- host = rx_HostOf(peerp);
- port = rx_PortOf(peerp);
- }
-
- osi_Log3(afsd_logp, "SRXAFSCB_GetCellByNum(%d) from host 0x%x port %d",
- a_cellnum, ntohl(host), ntohs(port));
-
- a_hosts->serverList_val = 0;
- a_hosts->serverList_len = 0;
- cellp = cm_FindCellByID(a_cellnum);
+ cellp = cm_FindCellByID(a_cellnum, CM_FLAG_NOPROBE);
if (!cellp) {
*a_name = strdup("");
- MUTEX_EXIT(&callp->lock);
return 0;
}
}
lock_ReleaseRead(&cm_serverLock);
- MUTEX_EXIT(&callp->lock);
return 0;
}
/* debug interface */
int
+SRXAFSCB_GetCellByNum(struct rx_call *callp, afs_int32 a_cellnum,
+ char **a_name, serverList *a_hosts)
+{
+ struct rx_connection *connp;
+ struct rx_peer *peerp;
+ unsigned long host = 0;
+ unsigned short port = 0;
+ int rc;
+
+ if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
+ host = rx_HostOf(peerp);
+ port = rx_PortOf(peerp);
+ }
+
+ osi_Log3(afsd_logp, "SRXAFSCB_GetCellByNum(%d) from host 0x%x port %d",
+ a_cellnum, ntohl(host), ntohs(port));
+
+ a_hosts->serverList_val = 0;
+ a_hosts->serverList_len = 0;
+
+
+ rc = GetCellCommon(a_cellnum, a_name, a_hosts);
+
+ return rc;
+}
+
+/* debug interface */
+int
SRXAFSCB_TellMeAboutYourself( struct rx_call *callp,
struct interfaceAddr *addr,
Capabilities * capabilities)
int i;
afs_int32 *dataBuffP;
afs_int32 dataBytes;
- int cm_noIPAddr; /* number of client network interfaces */
- int cm_IPAddr[CM_MAXINTERFACE_ADDR]; /* client's IP address in host order */
- int cm_SubnetMask[CM_MAXINTERFACE_ADDR];/* client's subnet mask in host order*/
- int cm_NetMtu[CM_MAXINTERFACE_ADDR]; /* client's MTU sizes */
- int cm_NetFlags[CM_MAXINTERFACE_ADDR]; /* network flags */
long code;
struct rx_connection *connp;
struct rx_peer *peerp;
unsigned long host = 0;
unsigned short port = 0;
- MUTEX_ENTER(&callp->lock);
-
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
}
- /* get network related info */
- cm_noIPAddr = CM_MAXINTERFACE_ADDR;
- code = syscfg_GetIFInfo(&cm_noIPAddr,
- cm_IPAddr, cm_SubnetMask,
- cm_NetMtu, cm_NetFlags);
-
osi_Log2(afsd_logp, "SRXAFSCB_TellMeAboutYourself from host 0x%x port %d",
ntohl(host),
ntohs(port));
+ lock_ObtainRead(&cm_syscfgLock);
+ if (cm_LanAdapterChangeDetected) {
+ lock_ConvertRToW(&cm_syscfgLock);
+ if (cm_LanAdapterChangeDetected) {
+ /* get network related info */
+ cm_noIPAddr = CM_MAXINTERFACE_ADDR;
+ code = syscfg_GetIFInfo(&cm_noIPAddr,
+ cm_IPAddr, cm_SubnetMask,
+ cm_NetMtu, cm_NetFlags);
+ cm_LanAdapterChangeDetected = 0;
+ }
+ lock_ConvertWToR(&cm_syscfgLock);
+ }
+
/* return all network interface addresses */
addr->numberOfInterfaces = cm_noIPAddr;
addr->uuid = cm_data.Uuid;
addr->mtu[i] = (rx_mtu == -1 || (rx_mtu != -1 && cm_NetMtu[i] < rx_mtu)) ?
cm_NetMtu[i] : rx_mtu;
}
+ lock_ReleaseRead(&cm_syscfgLock);
dataBytes = 1 * sizeof(afs_int32);
dataBuffP = (afs_int32 *) osi_Alloc(dataBytes);
capabilities->Capabilities_len = dataBytes / sizeof(afs_int32);
capabilities->Capabilities_val = dataBuffP;
- MUTEX_EXIT(&callp->lock);
return 0;
}
unsigned long host = 0;
unsigned short port = 0;
- MUTEX_ENTER(&callp->lock);
-
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
*a_srvr_addr = 0xffffffff;
*a_srvr_rank = 0xffffffff;
- MUTEX_EXIT(&callp->lock);
return 0;
}
int SRXAFSCB_GetCellServDB(struct rx_call *callp, afs_int32 index, char **a_name,
serverList *a_hosts)
{
- char *t_name;
struct rx_connection *connp;
struct rx_peer *peerp;
unsigned long host = 0;
unsigned short port = 0;
-
- MUTEX_ENTER(&callp->lock);
+ int rc;
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
osi_Log2(afsd_logp, "SRXAFSCB_GetCellServDB from host 0x%x port %d - not implemented",
ntohl(host), ntohs(port));
- t_name = (char *)malloc(AFSNAMEMAX);
- t_name[0] = '\0';
- *a_name = t_name;
- a_hosts->serverList_len = 0;
-
- MUTEX_EXIT(&callp->lock);
+#ifdef AFS_FREELANCE_CLIENT
+ if (cm_freelanceEnabled && index == 0) {
+ rc = GetCellCommon(AFS_FAKE_ROOT_CELL_ID, a_name, a_hosts);
+ } else
+#endif
+ {
+ rc = GetCellCommon(index+1, a_name, a_hosts);
+ }
return 0;
}
unsigned long host = 0;
unsigned short port = 0;
- MUTEX_ENTER(&callp->lock);
-
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
}
*a_name = t_name;
- MUTEX_EXIT(&callp->lock);
return 0;
}
unsigned long host = 0;
unsigned short port = 0;
- MUTEX_ENTER(&callp->lock);
-
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
config->cacheConfig_val = t_config;
config->cacheConfig_len = (*configCount)/sizeof(afs_uint32);
- MUTEX_EXIT(&callp->lock);
return 0;
}
} else if (fdc==2 && !fgc) { // we're in good shape
if (cm_getLocalMountPointChange()) { // check for changes
cm_clearLocalMountPointChange(); // clear the changefile
- lock_ReleaseMutex(&scp->mx); // this is re-locked in reInitLocalMountPoints
+ lock_ReleaseWrite(&scp->rw); // this is re-locked in reInitLocalMountPoints
cm_reInitLocalMountPoints(); // start reinit
- lock_ObtainMutex(&scp->mx); // now get the lock back
+ lock_ObtainWrite(&scp->rw); // now get the lock back
return 0;
}
return 1; // no change
if (scp->cbServerp != NULL) {
return 1;
} else if (cm_OfflineROIsValid) {
- switch (cm_GetVolumeStatus(scp->volp, scp->fid.volume)) {
- case vl_offline:
- case vl_alldown:
- case vl_unknown:
- return 1;
- default:
- return 0;
+ cm_volume_t *volp = cm_GetVolumeByFID(&scp->fid);
+ if (volp) {
+ switch (cm_GetVolumeStatus(volp, scp->fid.volume)) {
+ case vl_offline:
+ case vl_alldown:
+ case vl_unknown:
+ cm_PutVolume(volp);
+ return 1;
+ default:
+ cm_PutVolume(volp);
+ return 0;
+ }
}
- } else {
- return 0;
+ return 1;
}
+ return 0;
}
/* need to detect a broken callback that races with our obtaining a callback.
/* Called at the end of a callback-granting call, to remove the callback
* info from the scache entry, if necessary.
*
- * Called with scp locked, so we can discard the callbacks easily with
+ * Called with scp write locked, so we can discard the callbacks easily with
* this locking hierarchy.
*/
void cm_EndCallbackGrantingCall(cm_scache_t *scp, cm_callbackRequest_t *cbrp,
serverp = cbrp->serverp;
}
scp->cbExpires = cbrp->startTime + cbp->ExpirationTime;
- if (scp->flags & CM_SCACHEFLAG_PURERO && scp->volp)
- scp->volp->cbExpiresRO = scp->cbExpires;
+ if (scp->flags & CM_SCACHEFLAG_PURERO) {
+ cm_volume_t * volp = cm_GetVolumeByFID(&scp->fid);
+ if (volp) {
+ volp->cbExpiresRO = scp->cbExpires;
+ cm_PutVolume(volp);
+ }
+ }
} else {
if (freeFlag)
serverp = cbrp->serverp;
cbrp->callbackCount, revp->callbackCount,
cm_callbackCount);
discardScp = 1;
-
- if ((scp->flags & CM_SCACHEFLAG_PURERO) && scp->volp &&
- (revp->flags & (CM_RACINGFLAG_CANCELVOL | CM_RACINGFLAG_CANCELALL)))
- scp->volp->cbExpiresRO = 0;
+ if ((scp->flags & CM_SCACHEFLAG_PURERO) &&
+ (revp->flags & (CM_RACINGFLAG_CANCELVOL | CM_RACINGFLAG_CANCELALL))) {
+ cm_volume_t *volp = cm_GetVolumeByFID(&scp->fid);
+ if (volp) {
+ volp->cbExpiresRO = 0;
+ cm_PutVolume(volp);
+ }
+ }
}
if (freeFlag)
free(revp);
if ( discardScp ) {
cm_DiscardSCache(scp);
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
cm_CallbackNotifyChange(scp);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
}
if ( serverp ) {
}
cm_StartCallbackGrantingCall(scp, &cbr);
sfid = scp->fid;
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
/* now make the RPC */
osi_Log4(afsd_logp, "CALL FetchStatus scp 0x%p vol %u vn %u uniq %u",
osi_Log4(afsd_logp, "CALL FetchStatus SUCCESS scp 0x%p vol %u vn %u uniq %u",
scp, scp->fid.volume, scp->fid.vnode, scp->fid.unique);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
if (code == 0) {
cm_EndCallbackGrantingCall(scp, &cbr, &callback, 0);
cm_MergeStatus(NULL, scp, &afsStatus, &volSync, userp, 0);
long cm_CBServersUp(cm_scache_t *scp, time_t * downTime)
{
cm_vol_state_t *statep;
- cm_volume_t * volp = scp->volp;
+ cm_volume_t * volp;
afs_uint32 volID = scp->fid.volume;
cm_serverRef_t *tsrp;
int found;
if (scp->cbServerp == NULL)
return 1;
+ volp = cm_GetVolumeByFID(&scp->fid);
+ if (!volp)
+ return 1;
+
if (volp->rw.ID == volID) {
statep = &volp->rw;
} else if (volp->ro.ID == volID) {
} else if (volp->bk.ID == volID) {
statep = &volp->bk;
}
-
+ cm_PutVolume(volp);
if (statep->state == vl_online)
return 1;
for (i=0; i<cm_data.scacheHashTableSize; i++) {
for (scp = cm_data.scacheHashTablep[i]; scp; scp=scp->nextp) {
downTime = 0;
- if (scp->flags & CM_SCACHEFLAG_PURERO && scp->volp) {
- if (scp->volp->cbExpiresRO > scp->cbExpires && scp->cbExpires > 0)
- scp->cbExpires = scp->volp->cbExpiresRO;
+ if (scp->flags & CM_SCACHEFLAG_PURERO) {
+ cm_volume_t *volp = cm_GetVolumeByFID(&scp->fid);
+ if (volp) {
+ if (volp->cbExpiresRO > scp->cbExpires && scp->cbExpires > 0)
+ scp->cbExpires = volp->cbExpiresRO;
+ cm_PutVolume(volp);
+ }
}
-
if (scp->cbServerp && scp->cbExpires > 0 && now > scp->cbExpires &&
(cm_CBServersUp(scp, &downTime) || downTime == 0 || downTime >= scp->cbExpires))
{
osi_Log4(afsd_logp, "Callback Expiration Discarding SCache scp 0x%p vol %u vn %u uniq %u",
scp, scp->fid.volume, scp->fid.vnode, scp->fid.unique);
- lock_ObtainMutex(&scp->mx);
+ lock_ObtainWrite(&scp->rw);
cm_DiscardSCache(scp);
- lock_ReleaseMutex(&scp->mx);
+ lock_ReleaseWrite(&scp->rw);
cm_CallbackNotifyChange(scp);
- cm_ReleaseSCacheNoLock(scp);
lock_ObtainWrite(&cm_scacheLock);
+ cm_ReleaseSCacheNoLock(scp);
}
}
}
lock_ObtainMutex(&tsp->mx);
if (!(tsp->flags & CM_SERVERFLAG_DOWN)) {
tsp->flags |= CM_SERVERFLAG_DOWN;
- tsp->downTime = osi_Time();
+ tsp->downTime = time(NULL);
}
cm_ForceNewConnections(tsp);
- lock_ReleaseMutex(&tsp->mx);
/* Now update the volume status */
for (tsrvp = tsp->vols; tsrvp; tsrvp = tsrvp->nextp) {
cm_InitReq(&req);
- code = cm_GetVolumeByID(tsp->cellp, tsrvp->ids[i], cm_rootUserp,
- &req, CM_GETVOL_FLAG_NO_LRU_UPDATE, &volp);
+ code = cm_FindVolumeByID(tsp->cellp, tsrvp->ids[i], cm_rootUserp,
+ &req, CM_GETVOL_FLAG_NO_LRU_UPDATE | CM_GETVOL_FLAG_NO_RESET, &volp);
if (code == 0) {
cm_UpdateVolumeStatus(volp, tsrvp->ids[i]);
cm_PutVolume(volp);
}
}
}
+ lock_ReleaseMutex(&tsp->mx);
}
}
}
git://git.openafs.org / openafs.git / blobdiff