From 2324410f19e17c2fd61327f8fead73f0e936eca6 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Thu, 17 Apr 2008 18:24:42 +0000
Subject: [PATCH] STABLE14-afs-shutdown-free-resources-20071017

try hard to free resources


(cherry picked from commit eac13cbb48a95170a310dedb5d7efd1eeb4350b3)
---
 src/afs/afs_call.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index bb62040f0..d8d96b21c 100644
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -1871,12 +1871,15 @@ afs_shutdown(void)
 #endif
     afs_warn("\n");
 
+#ifdef AFS_AIX51_ENV
+    shutdown_daemons();
+#endif
+
     /* Close file only after daemons which can write to it are stopped. */
     if (afs_cacheInodep) {	/* memcache won't set this */
 	osi_UFSClose(afs_cacheInodep);	/* Since we always leave it open */
 	afs_cacheInodep = 0;
     }
-    return;			/* Just kill daemons for now */
 #ifdef notdef
     shutdown_CB();
     shutdown_AFS();
@@ -1884,21 +1887,16 @@ afs_shutdown(void)
     shutdown_rxevent();
     shutdown_rx();
     afs_shutdown_BKG();
-    shutdown_bufferpackage();
-#endif
-#ifdef AFS_AIX51_ENV
-    shutdown_daemons();
 #endif
-#ifdef notdef
+    shutdown_bufferpackage();
     shutdown_cache();
     shutdown_osi();
     shutdown_osinet();
     shutdown_osifile();
     shutdown_vnodeops();
-    shutdown_vfsops();
-    shutdown_exporter();
     shutdown_memcache();
 #if (!defined(AFS_NONFSTRANS) || defined(AFS_AIX_IAUTH_ENV)) && !defined(AFS_OSF_ENV)
+    shutdown_exporter();
     shutdown_nfsclnt();
 #endif
     shutdown_afstest();
@@ -1910,7 +1908,8 @@ afs_shutdown(void)
 */
     afs_warn(" ALL allocated tables\n");
     afs_shuttingdown = 0;
-#endif
+
+    return;			/* Just kill daemons for now */
 }
 
 void
-- 
2.39.5