Use new 'create_options' argument when creating DM devices

Cargo.toml

@@ -85,6 +85,8 @@ optional = true
 
 [dependencies.devicemapper]
 version = "0.33.3"
+git = "https://github.com/bmr-cymru/devicemapper-rs"
+branch = "bmr-create-options"
 optional = true
 
 [dependencies.dbus]

src/engine/strat_engine/backstore/backstore.rs

@@ -10,7 +10,7 @@ use chrono::{DateTime, Utc};
 use serde_json::Value;
 use tempfile::TempDir;
 
-use devicemapper::{CacheDev, Device, DmDevice, LinearDev, Sectors};
+use devicemapper::{CacheDev, Device, DmDevice, DmOptions, LinearDev, Sectors};
 
 use crate::{
     engine::{
@@ -60,6 +60,7 @@ fn make_cache(
         &dm_name,
         Some(&dm_uuid),
         cache_tier.meta_segments.map_to_dm(),
+        Some(DmOptions::private()),
     )?;
 
     if new {
@@ -77,6 +78,7 @@ fn make_cache(
         &dm_name,
         Some(&dm_uuid),
         cache_tier.cache_segments.map_to_dm(),
+        Some(DmOptions::private()),
     )?;
 
     let (dm_name, dm_uuid) = format_backstore_ids(pool_uuid, CacheRole::Cache);
@@ -88,6 +90,7 @@ fn make_cache(
         cache,
         origin,
         CACHE_BLOCK_SIZE,
+        Some(DmOptions::private()),
     )?)
 }
 
@@ -147,6 +150,7 @@ impl Backstore {
             &dm_name,
             Some(&dm_uuid),
             data_tier.segments.map_to_dm(),
+            Some(DmOptions::private()),
         ) {
             Ok(origin) => origin,
             Err(e) => {
@@ -389,7 +393,13 @@ impl Backstore {
         if create {
             let table = self.data_tier.segments.map_to_dm();
             let (dm_name, dm_uuid) = format_backstore_ids(pool_uuid, CacheRole::OriginSub);
-            let origin = LinearDev::setup(get_dm(), &dm_name, Some(&dm_uuid), table)?;
+            let origin = LinearDev::setup(
+                get_dm(),
+                &dm_name,
+                Some(&dm_uuid),
+                table,
+                Some(DmOptions::private()),
+            )?;
             self.linear = Some(origin);
         }
 

src/engine/strat_engine/tests/real.rs

@@ -14,7 +14,7 @@ use serde_json::{from_reader, Value};
 use uuid::Uuid;
 
 use devicemapper::{
-    devnode_to_devno, Bytes, Device, DmDevice, DmName, LinearDev, LinearDevTargetParams,
+    devnode_to_devno, Bytes, Device, DmDevice, DmName, DmOptions, LinearDev, LinearDevTargetParams,
     LinearTargetParams, Sectors, TargetLine, IEC,
 };
 
@@ -186,6 +186,7 @@ fn make_linear_test_dev(devnode: &Path, start: Sectors, length: Sectors) -> Line
         DmName::new(&format!("stratis_test_{}", Uuid::new_v4())).expect("valid format"),
         None,
         table,
+        Some(DmOptions::default()),
     )
     .unwrap()
 }

src/engine/strat_engine/thinpool/filesystem.rs

@@ -75,8 +75,15 @@ impl StratFilesystem {
     ) -> StratisResult<(FilesystemUuid, StratFilesystem)> {
         let fs_uuid = FilesystemUuid::new_v4();
         let (dm_name, dm_uuid) = format_thin_ids(pool_uuid, ThinRole::Filesystem(fs_uuid));
-        let mut thin_dev =
-            ThinDev::new(get_dm(), &dm_name, Some(&dm_uuid), size, thinpool_dev, id)?;
+        let mut thin_dev = ThinDev::new(
+            get_dm(),
+            &dm_name,
+            Some(&dm_uuid),
+            size,
+            thinpool_dev,
+            id,
+            Some(DmOptions::default()),
+        )?;
 
         if let Err(err) = create_fs(&thin_dev.devnode(), Some(StratisUuid::Fs(fs_uuid)), false) {
             if let Err(err2) = retry_with_index(Fixed::from_millis(100).take(4), |i| {
@@ -123,6 +130,7 @@ impl StratFilesystem {
             fssave.size,
             thinpool_dev,
             fssave.thin_id,
+            Some(DmOptions::default()),
         )?;
         Ok(StratFilesystem {
             used: init_used(&thin_dev),
@@ -192,6 +200,7 @@ impl StratFilesystem {
             snapshot_dm_uuid,
             thin_pool,
             snapshot_thin_id,
+            Some(DmOptions::default()),
         ) {
             Ok(thin_dev) => {
                 // If the source is mounted, XFS puts a dummy record in the

src/engine/strat_engine/thinpool/thinpool.rs

@@ -354,6 +354,7 @@ impl ThinPool {
             &dm_name,
             Some(&dm_uuid),
             segs_to_table(backstore_device, &[meta_segments]),
+            Some(DmOptions::private()),
         )?;
 
         // Wipe the first 4 KiB, i.e. 8 sectors as recommended in kernel DM
@@ -371,6 +372,7 @@ impl ThinPool {
             &dm_name,
             Some(&dm_uuid),
             segs_to_table(backstore_device, &[data_segments]),
+            Some(DmOptions::private()),
         )?;
 
         let (dm_name, dm_uuid) = format_flex_ids(pool_uuid, FlexRole::MetadataVolume);
@@ -379,6 +381,7 @@ impl ThinPool {
             &dm_name,
             Some(&dm_uuid),
             segs_to_table(backstore_device, &[mdv_segments]),
+            Some(DmOptions::private()),
         )?;
         let mdv = MetadataVol::initialize(pool_uuid, mdv_dev)?;
 
@@ -403,6 +406,7 @@ impl ThinPool {
                 "no_discard_passdown".to_string(),
                 "skip_block_zeroing".to_string(),
             ],
+            Some(DmOptions::private()),
         )?;
 
         let thin_pool_status = thinpool_dev.status(get_dm(), DmOptions::default()).ok();
@@ -463,6 +467,7 @@ impl ThinPool {
             &dm_name,
             Some(&dm_uuid),
             segs_to_table(backstore_device, &data_segments),
+            Some(DmOptions::private()),
         )?;
 
         // TODO: Remove in stratisd 4.0.
@@ -492,6 +497,7 @@ impl ThinPool {
                         "error_if_no_space".to_owned(),
                     ]
                 }),
+            Some(DmOptions::private()),
         )?;
 
         // TODO: Remove in stratisd 4.0.
@@ -505,6 +511,7 @@ impl ThinPool {
             &dm_name,
             Some(&dm_uuid),
             segs_to_table(backstore_device, &mdv_segments),
+            Some(DmOptions::private()),
         )?;
         let mdv = MetadataVol::setup(pool_uuid, mdv_dev)?;
         let filesystem_metadatas = mdv.filesystems()?;
@@ -1672,6 +1679,7 @@ fn setup_metadev(
         &dm_name,
         Some(&dm_uuid),
         segs_to_table(device, &meta_segments),
+        Some(DmOptions::private()),
     )?;
 
     if !device_exists(get_dm(), thinpool_name)? {
@@ -1703,6 +1711,7 @@ fn attempt_thin_repair(
         &dm_name,
         Some(&dm_uuid),
         segs_to_table(device, spare_segments),
+        Some(DmOptions::private()),
     )?;
 
     thin_repair(&meta_dev.devnode(), &new_meta_dev.devnode())?;