From: Derrick Brashear <shadow@dementix.org>
Date: Mon, 13 Feb 2012 21:11:19 +0000 (-0500)
Subject: libafs: kill rxevent daemon even in upcall mode
X-Git-Tag: upstream/1.6.1.pre4^2~64
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=94e836ede7aba4e6ae6ad7466d2d3c0a2fc69508;p=packages%2Fo%2Fopenafs.git

libafs: kill rxevent daemon even in upcall mode

the switch from rxk listener env to upcall env could leave the event
daemon running. fix that.

Reviewed-on: http://gerrit.openafs.org/6713
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit a4d9fbaa8036cc78ae0119330314f6deab159c90)

Change-Id: I2e87c692ee2003a24590f700accc30704899db8b
Reviewed-on: http://gerrit.openafs.org/6759
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Alistair Ferguson <alistair.ferguson@mac.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index 735ffad75..0841090e9 100644
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -1411,7 +1411,7 @@ afs_shutdown(void)
     afs_StopAFSDB();
     while (afs_termState == AFSOP_STOP_AFSDB)
 	afs_osi_Sleep(&afs_termState);
-#if	defined(AFS_SUN5_ENV) || defined(RXK_LISTENER_ENV)
+#if	defined(AFS_SUN5_ENV) || defined(RXK_LISTENER_ENV) || defined(RXK_UPCALL_ENV)
     afs_warn("RxEvent... ");
     /* cancel rx event daemon */
     while (afs_termState == AFSOP_STOP_RXEVENT)