From: Derrick Brashear Date: Tue, 19 Jun 2012 19:54:26 +0000 (-0400) Subject: libafs: put connection always in getcapabilities helper X-Git-Tag: upstream/1.6.2_pre2^2~154 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8540e8b80836d807091642e431c1b76100a84f3b;p=packages%2Fo%2Fopenafs.git libafs: put connection always in getcapabilities helper if we get a connection, we need to always put it back. here we exited with error before doing so. 1.6 only fix Change-Id: I67abec863c1d60d557277468a681847263d783a1 Reviewed-on: http://gerrit.openafs.org/7570 Reviewed-by: Jeffrey Altman Tested-by: BuildBot Reviewed-by: Andrew Deason Reviewed-by: Derrick Brashear --- diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c index 87172e4a6..0a7da20c7 100644 --- a/src/afs/afs_server.c +++ b/src/afs/afs_server.c @@ -1806,11 +1806,10 @@ afs_GetCapabilities(struct server *ts) ObtainWriteLock(&afs_xserver, 723); /* we forced a conn above; important we mark it down if needed */ if ((code < 0) && (code != RXGEN_OPCODE)) { - afs_PutConn(tc, rxconn, SHARED_LOCK); afs_ServerDown(tc->srvr); ForceNewConnections(tc->srvr); /* multi homed clients */ } - + afs_PutConn(tc, rxconn, SHARED_LOCK); if ( code && code != RXGEN_OPCODE ) { afs_warn("RXAFS_GetCapabilities failed with code %d\n", code); /* better not be anything to free. we failed! */