diff --git a/src/engine/strat_engine/cmd.rs b/src/engine/strat_engine/cmd.rs index 764548fb092..0f6a870520a 100644 --- a/src/engine/strat_engine/cmd.rs +++ b/src/engine/strat_engine/cmd.rs @@ -234,11 +234,7 @@ fn get_clevis_executable(name: &str) -> StratisResult { /// Create a filesystem on devnode. If uuid specified, set the UUID of the /// filesystem on creation. If 'noalign', set the noalign option. -/// NOTE: It used to be desirable to set the noalign option when creating the -/// MDV, because it was very small; since then the size of the MDV has been -/// increased, and it is no longer necessary to pass the noalign option when -/// creating the MDV. -pub fn create_fs(devnode: &Path, uuid: Option, noalign: bool) -> StratisResult<()> { +pub fn create_fs(devnode: &Path, uuid: Option) -> StratisResult<()> { let mut command = Command::new(get_executable(MKFS_XFS).as_os_str()); command.arg("-f"); command.arg("-q"); @@ -248,10 +244,6 @@ pub fn create_fs(devnode: &Path, uuid: Option, noalign: bool) -> St command.arg("-m"); command.arg(format!("uuid={uuid}")); } - if noalign { - command.arg("-d"); - command.arg("noalign"); - } execute_cmd(&mut command) } diff --git a/src/engine/strat_engine/liminal/identify.rs b/src/engine/strat_engine/liminal/identify.rs index 938fc8b74be..ca6acb08d91 100644 --- a/src/engine/strat_engine/liminal/identify.rs +++ b/src/engine/strat_engine/liminal/identify.rs @@ -699,7 +699,7 @@ mod tests { } for path in paths { - create_fs(path, None, false).unwrap(); + create_fs(path, None).unwrap(); let device_path = DevicePath::new(path).expect("our test path"); assert_eq!( block_device_apply(&device_path, process_stratis_device) diff --git a/src/engine/strat_engine/thinpool/filesystem.rs b/src/engine/strat_engine/thinpool/filesystem.rs index 8248336c65c..a93fd9dab5f 100644 --- a/src/engine/strat_engine/thinpool/filesystem.rs +++ b/src/engine/strat_engine/thinpool/filesystem.rs @@ -88,7 +88,7 @@ impl StratFilesystem { let mut thin_dev = ThinDev::new(get_dm(), &dm_name, Some(&dm_uuid), size, thinpool_dev, id)?; - if let Err(err) = create_fs(&thin_dev.devnode(), Some(StratisUuid::Fs(fs_uuid)), false) { + if let Err(err) = create_fs(&thin_dev.devnode(), Some(StratisUuid::Fs(fs_uuid))) { if let Err(err2) = retry_with_index(Fixed::from_millis(100).take(4), |i| { trace!( "Cleanup new thin device after failed create_fs() attempt {}", diff --git a/src/engine/strat_engine/thinpool/mdv.rs b/src/engine/strat_engine/thinpool/mdv.rs index df27253f54c..56687f950a1 100644 --- a/src/engine/strat_engine/thinpool/mdv.rs +++ b/src/engine/strat_engine/thinpool/mdv.rs @@ -52,7 +52,7 @@ impl MetadataVol { /// Initialize a new Metadata Volume. pub fn initialize(pool_uuid: PoolUuid, dev: LinearDev) -> StratisResult { - create_fs(&dev.devnode(), Some(StratisUuid::Pool(pool_uuid)), false)?; + create_fs(&dev.devnode(), Some(StratisUuid::Pool(pool_uuid)))?; MetadataVol::setup(pool_uuid, dev) }