Store the real size in the StratBlockdev on setup

Signed-off-by: mulhern <[email protected]>

src/engine/strat_engine/backstore/blockdev.rs

@@ -71,6 +71,7 @@ pub struct StratBlockDev {
     user_info: Option<String>,
     hardware_info: Option<String>,
     underlying_device: UnderlyingDevice,
+    real_size: BlockdevSize,
 }
 
 impl StratBlockDev {
@@ -95,13 +96,15 @@ impl StratBlockDev {
     ///
     /// Precondition: segments in other_segments do not overlap with Stratis
     /// metadata region.
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         dev: Device,
         bda: BDA,
         other_segments: &[(Sectors, Sectors)],
         user_info: Option<String>,
         hardware_info: Option<String>,
         underlying_device: UnderlyingDevice,
+        real_size: BlockdevSize,
     ) -> StratisResult<StratBlockDev> {
         let mut segments = vec![(Sectors(0), bda.extended_size().sectors())];
         segments.extend(other_segments);
@@ -115,6 +118,7 @@ impl StratBlockDev {
             user_info,
             hardware_info,
             underlying_device,
+            real_size,
         })
     }
 

src/engine/strat_engine/backstore/devices.rs

@@ -473,7 +473,7 @@ pub fn initialize_devices(
 
         bda.initialize(&mut f)?;
 
-        StratBlockDev::new(devno, bda, &[], None, hw_id, underlying_device)
+        StratBlockDev::new(devno, bda, &[], None, hw_id, underlying_device, data_size)
     }
 
     /// Clean up an encrypted device after initialization failure.

src/engine/strat_engine/liminal/setup.rs

@@ -20,7 +20,7 @@ use crate::{
             backstore::{CryptHandle, StratBlockDev, UnderlyingDevice},
             device::blkdev_size,
             liminal::device_info::LStratisInfo,
-            metadata::{StaticHeader, BDA},
+            metadata::{BlockdevSize, StaticHeader, BDA},
             serde_structs::{BackstoreSave, BaseBlockDevSave, PoolSave},
         },
         types::{ActionAvailability, BlockDevTier, DevUuid, DevicePath, PoolEncryptionInfo},
@@ -200,8 +200,8 @@ pub fn get_blockdevs(
         // Return an error if apparent size of Stratis block device appears to
         // have decreased since metadata was recorded or if size of block
         // device could not be obtained.
-        blkdev_size(&OpenOptions::new().read(true).open(&info.ids.devnode)?).and_then(
-            |actual_size| {
+        let real_size = blkdev_size(&OpenOptions::new().read(true).open(&info.ids.devnode)?)
+            .and_then(|actual_size| {
                 let actual_size_sectors = actual_size.sectors();
                 let recorded_size = bda.dev_size().sectors();
                 if actual_size_sectors < recorded_size {
@@ -213,10 +213,9 @@ pub fn get_blockdevs(
                     );
                     Err(StratisError::Msg(err_msg))
                 } else {
-                    Ok(())
+                    Ok(BlockdevSize::new(actual_size.sectors()))
                 }
-            },
-        )?;
+            })?;
 
         let dev_uuid = bda.dev_uuid();
 
@@ -261,6 +260,7 @@ pub fn get_blockdevs(
                     Some(handle) => UnderlyingDevice::Encrypted(handle),
                     None => UnderlyingDevice::Unencrypted(DevicePath::new(physical_path)?),
                 },
+                real_size,
             )?,
         ))
     }