dscp->flags & CM_SCACHEFLAG_ANYWATCH )
smb_NotifyChange( 0,
FILE_NOTIFY_GENERIC_FILE_FILTER,
- dscp, NULL, NULL, TRUE);
+ dscp, NULL, NULL, TRUE);
#else
if (dscp)
dc_break_callback(FID_HASH_FN(&dscp->fid));
*
* The callp parameter is currently unused.
*/
-void cm_RevokeCallback(struct rx_call *callp, AFSFid *fidp)
+void cm_RevokeCallback(struct rx_call *callp, cm_cell_t * cellp, AFSFid *fidp)
{
cm_fid_t tfid;
cm_scache_t *scp;
/* do all in the hash bucket, since we don't know how many we'll find with
* varying cells.
*/
- for (scp = cm_data.hashTablep[hash]; scp; scp=scp->nextp) {
+ for (scp = cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) {
if (scp->fid.volume == tfid.volume &&
scp->fid.vnode == tfid.vnode &&
scp->fid.unique == tfid.unique &&
+ (cellp == NULL || scp->fid.cell == cellp->cellID) &&
scp->cbExpires > 0 &&
scp->cbServerp != NULL)
{
*
* Called with no locks held.
*/
-void cm_RevokeVolumeCallback(struct rx_call *callp, AFSFid *fidp)
+void cm_RevokeVolumeCallback(struct rx_call *callp, cm_cell_t *cellp, AFSFid *fidp)
{
long hash;
cm_scache_t *scp;
lock_ObtainWrite(&cm_scacheLock);
- for (hash = 0; hash < cm_data.hashTableSize; hash++) {
- for(scp=cm_data.hashTablep[hash]; scp; scp=scp->nextp) {
+ for (hash = 0; hash < cm_data.scacheHashTableSize; hash++) {
+ for(scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) {
if (scp->fid.volume == fidp->Volume &&
+ (cellp == NULL || scp->fid.cell == cellp->cellID) &&
scp->cbExpires > 0 &&
scp->cbServerp != NULL) {
cm_HoldSCacheNoLock(scp);
struct rx_peer *peerp;
unsigned long host = 0;
unsigned short port = 0;
+ cm_server_t *tsp = NULL;
+ cm_cell_t * cellp = NULL;
MUTEX_ENTER(&callp->lock);
if ((connp = rx_ConnectionOf(callp)) && (peerp = rx_PeerOf(connp))) {
host = rx_HostOf(peerp);
port = rx_PortOf(peerp);
+
+ tsp = cm_FindServerByIP(host);
+ if (tsp)
+ cellp = tsp->cellp;
}
osi_Log2(afsd_logp, "SRXAFSCB_CallBack from host 0x%x port %d",
if (tfidp->Volume == 0)
continue; /* means don't do anything */
else if (tfidp->Vnode == 0)
- cm_RevokeVolumeCallback(callp, tfidp);
+ cm_RevokeVolumeCallback(callp, cellp, tfidp);
else
- cm_RevokeCallback(callp, tfidp);
+ cm_RevokeCallback(callp, cellp, tfidp);
}
MUTEX_EXIT(&callp->lock);
* are "rare," hopefully this won't be a problem.
*/
lock_ObtainWrite(&cm_scacheLock);
- for (hash = 0; hash < cm_data.hashTableSize; hash++) {
- for (scp=cm_data.hashTablep[hash]; scp; scp=scp->nextp) {
+ for (hash = 0; hash < cm_data.scacheHashTableSize; hash++) {
+ for (scp=cm_data.scacheHashTablep[hash]; scp; scp=scp->nextp) {
cm_HoldSCacheNoLock(scp);
lock_ReleaseWrite(&cm_scacheLock);
lock_ObtainMutex(&scp->mx);
ntohl(host), ntohs(port));
lock_ObtainRead(&cm_scacheLock);
- for (i = 0; i < cm_data.hashTableSize; i++) {
- for (scp = cm_data.hashTablep[i]; scp; scp = scp->nextp) {
+ for (i = 0; i < cm_data.scacheHashTableSize; i++) {
+ for (scp = cm_data.scacheHashTablep[i]; scp; scp = scp->nextp) {
if (index == 0)
goto searchDone;
index--;
ntohl(host), ntohs(port));
lock_ObtainRead(&cm_scacheLock);
- for (i = 0; i < cm_data.hashTableSize; i++) {
- for (scp = cm_data.hashTablep[i]; scp; scp = scp->nextp) {
+ for (i = 0; i < cm_data.scacheHashTableSize; i++) {
+ for (scp = cm_data.scacheHashTablep[i]; scp; scp = scp->nextp) {
if (index == 0)
goto searchDone;
index--;
lock_ReleaseMutex(&cm_Freelance_Lock);
// Fetch the status info
- cm_MergeStatus(scp, &afsStatus, &volSync, userp, 0);
+ cm_MergeStatus(NULL, scp, &afsStatus, &volSync, userp, 0);
// Indicate that the callback is not done
lock_ObtainMutex(&cm_Freelance_Lock);
osi_Log4(afsd_logp, "CALL FetchStatus scp 0x%p vol %u vn %u uniq %u",
scp, sfid.volume, sfid.vnode, sfid.unique);
do {
- code = cm_Conn(&sfid, userp, reqp, &connp);
+ code = cm_ConnFromFID(&sfid, userp, reqp, &connp);
if (code)
continue;
lock_ObtainMutex(&scp->mx);
if (code == 0) {
cm_EndCallbackGrantingCall(scp, &cbr, &callback, 0);
- cm_MergeStatus(scp, &afsStatus, &volSync, userp, 0);
+ cm_MergeStatus(NULL, scp, &afsStatus, &volSync, userp, 0);
} else {
cm_EndCallbackGrantingCall(NULL, &cbr, NULL, 0);
}
now = osi_Time();
lock_ObtainWrite(&cm_scacheLock);
- for (i=0; i<cm_data.hashTableSize; i++) {
- for (scp = cm_data.hashTablep[i]; scp; scp=scp->nextp) {
+ for (i=0; i<cm_data.scacheHashTableSize; i++) {
+ for (scp = cm_data.scacheHashTablep[i]; scp; scp=scp->nextp) {
cm_HoldSCacheNoLock(scp);
if (scp->cbExpires > 0 && (scp->cbServerp == NULL || now > scp->cbExpires)) {
lock_ReleaseWrite(&cm_scacheLock);