Since r21967 converted the mpool sm module into a real module, it broke some of the C/R logic in the ft_event funciton (actually it wouldn't build after that patch).

This commit fixes the ft_event logic so that it uses the normal destroy funcitonality instead of the workaround with the component that was previously there. All and all it made for cleaner code, which is always good.

If r21967 moves to v1.3, this patch will need to be moved as well.

This commit was SVN r21972.

The following SVN revision numbers were found above:
  r21967 --> open-mpi/ompi@533633b8cb

ompi/mca/mpool/sm/mpool_sm_module.c

@@ -159,6 +159,7 @@ int mca_mpool_sm_ft_event(int state) {
 #else
 int mca_mpool_sm_ft_event(int state) {
     mca_mpool_base_module_t *self_module = NULL;
+    mca_mpool_sm_module_t   *self_sm_module = NULL;
     char * file_name = NULL;
 
     if(OPAL_CRS_CHECKPOINT == state) {
@@ -172,34 +173,32 @@ int mca_mpool_sm_ft_event(int state) {
     }
     else if(OPAL_CRS_CONTINUE == state) {
         if(ompi_cr_continue_like_restart) {
-            /* Remove self from the list of all modules */
+            /* Find the sm module */
             self_module = mca_mpool_base_module_lookup("sm");
-            mca_mpool_base_module_destroy(self_module);
+            self_sm_module = (mca_mpool_sm_module_t*) self_module;
 
-            /* Release the old sm file, if it exists */
-            if( NULL != mca_common_sm_mmap ) {
-                if( OMPI_SUCCESS == mca_common_sm_mmap_fini( mca_common_sm_mmap ) ) {
-                    /* Add old shared memory file for eventual removal */
-                    opal_crs_base_cleanup_append(mca_common_sm_mmap->map_path, false);
-                }
-                OBJ_RELEASE( mca_common_sm_mmap );
+            /* Mark the old sm file for eventual removal via CRS */
+            if (NULL != self_sm_module->sm_common_mmap) {
+                opal_crs_base_cleanup_append(self_sm_module->sm_common_mmap->map_path, false);
             }
+
+            /* Remove self from the list of all modules */
+            mca_mpool_base_module_destroy(self_module);
         }
     }
     else if(OPAL_CRS_RESTART == state ||
             OPAL_CRS_RESTART_PRE == state) {
-        /* Remove self from the list of all modules */
+        /* Find the sm module */
         self_module = mca_mpool_base_module_lookup("sm");
-        mca_mpool_base_module_destroy(self_module);
+        self_sm_module = (mca_mpool_sm_module_t*) self_module;
 
-        /* Release the old sm file, if it exists */
-        if( NULL != mca_common_sm_mmap ) {
-            if( OMPI_SUCCESS == mca_common_sm_mmap_fini( mca_common_sm_mmap ) ) {
-                /* Add old shared memory file for eventual removal */
-                opal_crs_base_cleanup_append(mca_common_sm_mmap->map_path, false);
-            }
-            OBJ_RELEASE( mca_common_sm_mmap );
+        /* Mark the old sm file for eventual removal via CRS */
+        if (NULL != self_sm_module->sm_common_mmap) {
+            opal_crs_base_cleanup_append(self_sm_module->sm_common_mmap->map_path, false);
         }
+
+        /* Remove self from the list of all modules */
+        mca_mpool_base_module_destroy(self_module);
     }
     else if(OPAL_CRS_TERM == state ) {
         ;