From 37f41897fb9d28e32c8def34790d653ef585400f Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Wed, 13 Jul 2011 13:45:33 +0100 Subject: [PATCH] libafs: Remove unused NAT markeddown code Remove unused code which used to retry once when a server was marked down due to a bad NAT. This code has never been enabled in OpenAFS, and causes compile errors with gcc 4.6.0 Change-Id: Idc978a68e81ccb761117c97200607e30c98627dc Reviewed-on: http://gerrit.openafs.org/4987 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/afs/afs_analyze.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c index 220311e81..fc65ca5c2 100644 --- a/src/afs/afs_analyze.c +++ b/src/afs/afs_analyze.c @@ -315,7 +315,6 @@ afs_Analyze(struct afs_conn *aconn, struct rx_connection *rxconn, afs_int32 shouldRetry = 0; afs_int32 serversleft = 1; struct afs_stats_RPCErrors *aerrP; - afs_int32 markeddown; afs_uint32 address; if (AFS_IS_DISCONNECTED && !AFS_IN_SYNC) { @@ -484,17 +483,10 @@ afs_Analyze(struct afs_conn *aconn, struct rx_connection *rxconn, */ goto out; } - markeddown = afs_ServerDown(sa); + afs_ServerDown(sa); ForceNewConnections(sa); /**multi homed clients lock:afs_xsrvAddr? */ if (aerrP) (aerrP->err_Server)++; -#if 0 - /* retry *once* when the server is timed out in case of NAT */ - if (markeddown && acode == RX_CALL_DEAD) { - aconn->forceConnectFS = 1; - shouldRetry = 1; - } -#endif } if (acode == VBUSY || acode == VRESTARTING) { -- 2.39.5