tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

disks: refactor partition type handling

Browse Source 
in preparation to also get the file system type from lsblk.

Co-developed-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner
2021-07-09 12:32:33 +02:00
committed by Thomas Lamprecht
parent b81818b6ad
commit 364299740f
3 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/tools/disks/zfs.rs
View File

@ -1,5 +1,5 @@
use std::path::PathBuf;
use std::collections::{HashMap, HashSet};
use std::collections::HashSet;
use std::os::unix::fs::MetadataExt;
use anyhow::{bail, Error};
@ -67,12 +67,11 @@ pub fn zfs_pool_stats(pool: &OsStr) -> Result<Option<BlockDevStat>, Error> {
Ok(Some(stat))
}
/// Get set of devices used by zfs (or a specific zfs pool)
///
/// The set is indexed by using the unix raw device number (dev_t is u64)
pub fn zfs_devices(
partition_type_map: &HashMap<String, Vec<String>>,
lsblk_info: &[LsblkInfo],
pool: Option<String>,
) -> Result<HashSet<u64>, Error> {
@ -86,12 +85,12 @@ pub fn zfs_devices(
}
}
for device_list in partition_type_map.iter()
.filter_map(|(uuid, list)| if ZFS_UUIDS.contains(uuid.as_str()) { Some(list) } else { None })
{
for device in device_list {
let meta = std::fs::metadata(device)?;
device_set.insert(meta.rdev());
for info in lsblk_info.iter() {
if let Some(partition_type) = &info.partition_type {
if ZFS_UUIDS.contains(partition_type.as_str()) {
let meta = std::fs::metadata(&info.path)?;
device_set.insert(meta.rdev());
}
}
}