STABLE14-afs-shutdown-cleanup-20071210

LICENSE IPL10
FIXES 74479

clean up allocated resources when we shut down

(cherry picked from commit f5fde5736f333e284a244467641f08727481b4ae)

diff --git a/src/afs/afs_call.c b/src/afs/afs_call.c
index 582f96ddb58f2b16933120ae897497c55d6ba2e4..dcf0a8ba4e7bdc160209a605fc46416067997808 100644 (file)
--- a/src/afs/afs_call.c
+++ b/src/afs/afs_call.c
@@ -1875,11 +1875,6 @@ afs_shutdown(void)
     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;
-    }
 #ifdef notdef
     shutdown_CB();
     shutdown_AFS();
@@ -1888,7 +1883,6 @@ afs_shutdown(void)
     shutdown_rx();
     afs_shutdown_BKG();
 #endif
-    return;
     shutdown_bufferpackage();
     shutdown_cache();
     shutdown_osi();
@@ -1908,6 +1902,13 @@ afs_shutdown(void)
     memset(&afs_stats_cmfullperf, 0, sizeof(struct afs_stats_CMFullPerf));
 */
     afs_warn(" ALL allocated tables\n");
+
+    /* 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;
+    }
+
     afs_shuttingdown = 0;
 
     return;                    /* Just kill daemons for now */