From a26f4b188172ed157b4ddf9006e46186702b5b56 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Tue, 12 Apr 2011 16:30:55 -0500 Subject: [PATCH] libafs: Do not specify an Rx busy channel error Do not specify an error for Rx busy channels in libafs, so we do not get notified of busy channel notifications. The current code just specifies RX_CALL_TIMEOUT for the busy channel error, which has problems (in particular, for RXAFS calls that are not wrapped in an afs_Analyze loop). So, disable this behavior. This is a 1.6-specific change. The master branch will instead get fixes for this functionality, and it will get turned on in 1.6 again as appropriate. Change-Id: I0ed292a61ba4c8d0e59017b3dfaadc88d17591e6 Reviewed-on: http://gerrit.openafs.org/4460 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/afs/afs_call.c | 2 -- src/afs/afs_pag_call.c | 1 - 2 files changed, 3 deletions(-) diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c index f2778feb4..ddacaf7f6 100644 --- a/src/afs/afs_call.c +++ b/src/afs/afs_call.c @@ -107,8 +107,6 @@ afs_InitSetup(int preallocs) memset(afs_zeros, 0, AFS_ZEROS); - rx_SetBusyChannelError(RX_CALL_TIMEOUT); - /* start RX */ if(!afscall_set_rxpck_received) rx_extraPackets = AFS_NRXPACKETS; /* smaller # of packets */ diff --git a/src/afs/afs_pag_call.c b/src/afs/afs_pag_call.c index d61a91c7e..a0bf09642 100644 --- a/src/afs/afs_pag_call.c +++ b/src/afs/afs_pag_call.c @@ -98,7 +98,6 @@ afspag_Init(afs_int32 nfs_server_addr) AFS_GLOCK(); afs_InitStats(); - rx_SetBusyChannelError(RX_CALL_TIMEOUT); rx_Init(htons(7001)); AFS_STATCNT(afs_ResourceInit); -- 2.39.5