From 5245d15c2305bf4edf2758f01c97264323db6583 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Thu, 15 Nov 2012 18:21:27 +0000 Subject: [PATCH] rx: Remove unused timeoutEvent The timeoutEvent pointer in the rx_call structure is unused. Remove it to reduce confusion about which events can hold call reference counts. Change-Id: Ide625fe0af608cc434c33188e642750979a8db21 Reviewed-on: http://gerrit.openafs.org/8536 Tested-by: BuildBot Reviewed-by: Jeffrey Altman Reviewed-by: Derrick Brashear --- src/rx/rx.c | 4 ++-- src/rx/rx_call.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rx/rx.c b/src/rx/rx.c index cfd999d25..4be90a2d0 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -9262,7 +9262,7 @@ int rx_DumpCalls(FILE *outputFile, char *cookie) RXDPRINTF(RXDPRINTOUT, "%s - call=0x%p, id=%u, state=%u, mode=%u, conn=%p, epoch=%u, cid=%u, callNum=%u, connFlags=0x%x, flags=0x%x, " "rqc=%u,%u, tqc=%u,%u, iovqc=%u,%u, " "lstatus=%u, rstatus=%u, error=%d, timeout=%u, " - "resendEvent=%d, timeoutEvt=%d, keepAliveEvt=%d, delayedAckEvt=%d, delayedAbortEvt=%d, abortCode=%d, abortCount=%d, " + "resendEvent=%d, keepAliveEvt=%d, delayedAckEvt=%d, delayedAbortEvt=%d, abortCode=%d, abortCount=%d, " "lastSendTime=%u, lastRecvTime=%u, lastSendData=%u" #ifdef RX_ENABLE_LOCKS ", refCount=%u" @@ -9276,7 +9276,7 @@ int rx_DumpCalls(FILE *outputFile, char *cookie) c->callNumber?*c->callNumber:0, c->conn?c->conn->flags:0, c->flags, (afs_uint32)c->rqc, (afs_uint32)rqc, (afs_uint32)c->tqc, (afs_uint32)tqc, (afs_uint32)c->iovqc, (afs_uint32)iovqc, (afs_uint32)c->localStatus, (afs_uint32)c->remoteStatus, c->error, c->timeout, - c->resendEvent?1:0, c->timeoutEvent?1:0, c->keepAliveEvent?1:0, c->delayedAckEvent?1:0, c->delayedAbortEvent?1:0, + c->resendEvent?1:0, c->keepAliveEvent?1:0, c->delayedAckEvent?1:0, c->delayedAbortEvent?1:0, c->abortCode, c->abortCount, c->lastSendTime, c->lastReceiveTime, c->lastSendData #ifdef RX_ENABLE_LOCKS , (afs_uint32)c->refCount diff --git a/src/rx/rx_call.h b/src/rx/rx_call.h index 66ed5d197..68563590c 100644 --- a/src/rx/rx_call.h +++ b/src/rx/rx_call.h @@ -92,7 +92,6 @@ struct rx_call { int rtt_dev; struct clock rto; /* The round trip timeout calculated for this call */ struct rxevent *resendEvent; /* If this is non-Null, there is a retransmission event pending */ - struct rxevent *timeoutEvent; /* If this is non-Null, then there is an overall timeout for this call */ struct rxevent *keepAliveEvent; /* Scheduled periodically in active calls to keep call alive */ struct rxevent *growMTUEvent; /* Scheduled periodically in active calls to discover true maximum MTU */ struct rxevent *delayedAckEvent; /* Scheduled after all packets are received to send an ack if a reply or new call is not generated soon */ -- 2.39.5