From 2c718332d5521c78395004e7ca1995faad718cc7 Mon Sep 17 00:00:00 2001 From: John Baublitz Date: Thu, 16 Jun 2022 13:52:22 -0400 Subject: [PATCH] Revert unnecessary change --- src/engine/strat_engine/thinpool/thinpool.rs | 34 +++++++++++--------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/engine/strat_engine/thinpool/thinpool.rs b/src/engine/strat_engine/thinpool/thinpool.rs index 8c518699a92..2d0ff393018 100644 --- a/src/engine/strat_engine/thinpool/thinpool.rs +++ b/src/engine/strat_engine/thinpool/thinpool.rs @@ -622,21 +622,25 @@ impl ThinPool { let mdv = MetadataVol::setup(pool_uuid, mdv_dev)?; let filesystem_metadatas = mdv.filesystems()?; - let mut filesystems = Vec::with_capacity(filesystem_metadatas.len()); - for fssave in filesystem_metadatas.iter() { - match StratFilesystem::setup(pool_uuid, &thinpool_dev, fssave) { - Ok(fs) => { - fs.udev_fs_change(pool_name, fssave.uuid, &fssave.name); - filesystems.push((Name::new(fssave.name.to_owned()), fssave.uuid, fs)); - } - Err(err) => { - warn!( - "Filesystem specified by metadata {:?} could not be setup, reason: {:?}", - fssave, err - ); - } - } - } + let filesystems = filesystem_metadatas + .iter() + .filter_map( + |fssave| match StratFilesystem::setup(pool_uuid, &thinpool_dev, fssave) { + Ok(fs) => { + fs.udev_fs_change(pool_name, fssave.uuid, &fssave.name); + Some((Name::new(fssave.name.to_owned()), fssave.uuid, fs)) + }, + Err(err) => { + warn!( + "Filesystem specified by metadata {:?} could not be setup, reason: {:?}", + fssave, + err + ); + None + } + }, + ) + .collect::>(); let mut fs_table = Table::default(); for (name, uuid, fs) in filesystems {