Merge #1847

1847: fix(crypto): use Cstring while type converting to c_char r=dsharma-dc a=dsharma-dc



Co-authored-by: Diwakar Sharma <[email protected]>

Author: mayastor-bors

io-engine/src/bdev/crypto.rs

@@ -64,7 +64,7 @@ pub enum Cipher {
     AesXts,
 }
 
-#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Default, PartialEq, Serialize, Deserialize)]
 /// A struct that represents the parameters required to create a key.
 pub struct EncryptionKey {
     pub cipher: Cipher,
@@ -76,6 +76,15 @@ pub struct EncryptionKey {
     pub key2_len: Option<u32>,
 }
 
+impl Debug for EncryptionKey {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("EncryptionKey")
+            .field("cipher", &self.cipher)
+            .field("key_name", &self.key_name)
+            .finish()
+    }
+}
+
 impl Debug for Crypto {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         write!(
@@ -217,7 +226,7 @@ pub async fn destroy_crypto_vbdev(vbdev_name: String) -> Result<(), BdevError> {
     let (s, r) = pair::<i32>();
     unsafe {
         delete_crypto_disk(
-            vbdev_name.as_ptr() as *mut std::os::raw::c_char,
+            vbdev_name.clone().into_cstring().as_ptr() as *mut std::os::raw::c_char,
             Some(crypto_vbdev_op_cb),
             cb_arg(s),
         );

io-engine/src/lvs/lvs_store.rs

@@ -686,7 +686,11 @@ impl Lvs {
                 name: pool.clone(),
             })?;
 
-        info!("{}: lvs exported successfully", self_str);
+        info!(
+            "{}: lvs exported successfully. base bdev: {}",
+            self_str,
+            base_bdev.name()
+        );
 
         // If the base_bdev is a crypto vbdev then we need to destroy both - the crypto vbdev and it's base.
         if base_bdev.driver() == "crypto" {