Clean up and bug fixes

src/engine/strat_engine/backstore/backstore.rs

@@ -511,25 +511,17 @@ impl Backstore {
         self.data_tier.destroy()
     }
 
-    /// Run code required to stop a pool on backstore data structures.
-    pub fn stop(&mut self) -> StratisResult<()> {
-        self.data_tier.block_mgr.teardown()
-    }
-
     /// Teardown the DM devices in the backstore.
-    #[cfg(test)]
     pub fn teardown(&mut self) -> StratisResult<()> {
         match self.cache {
-            Some(ref mut cache) => cache.teardown(get_dm()),
+            Some(ref mut cache) => cache.teardown(get_dm())?,
             None => {
                 if let Some(ref mut linear) = self.linear {
-                    linear.teardown(get_dm())
-                } else {
-                    Ok(())
+                    linear.teardown(get_dm())?;
                 }
             }
-        }
-        .map_err(|e| e.into())
+        };
+        self.data_tier.block_mgr.teardown()
     }
 
     /// Return the device that this tier is currently using.

src/engine/strat_engine/backstore/blockdev.rs

@@ -302,6 +302,10 @@ impl StratBlockDev {
     /// physical device.
     pub fn teardown(&mut self) -> StratisResult<()> {
         if let Some(ch) = self.underlying_device.crypt_handle() {
+            debug!(
+                "Deactivating unlocked encrypted device with UUID {}",
+                self.bda.dev_uuid()
+            );
             ch.deactivate()
         } else {
             Ok(())