diff --git a/src/tools/disks.rs b/src/tools/disks.rs index 885edf47..0fd45331 100644 --- a/src/tools/disks.rs +++ b/src/tools/disks.rs @@ -54,6 +54,9 @@ pub struct LsblkInfo { /// Partition type GUID. #[serde(rename = "parttype")] partition_type: Option, + /// File system label. + #[serde(rename = "fstype")] + file_system_type: Option, } impl DiskManage { @@ -565,11 +568,11 @@ pub struct BlockDevStat { pub io_ticks: u64, // milliseconds } -/// Use lsblk to read partition type uuids. +/// Use lsblk to read partition type uuids and file system types. pub fn get_lsblk_info() -> Result, Error> { let mut command = std::process::Command::new("lsblk"); - command.args(&["--json", "-o", "path,parttype"]); + command.args(&["--json", "-o", "path,parttype,fstype"]); let output = crate::tools::run_command(command, None)?; @@ -578,6 +581,25 @@ pub fn get_lsblk_info() -> Result, Error> { Ok(serde_json::from_value(output["blockdevices"].take())?) } +/// Get set of devices with a file system label. +/// +/// The set is indexed by using the unix raw device number (dev_t is u64) +fn get_file_system_devices( + lsblk_info: &[LsblkInfo], +) -> Result, Error> { + + let mut device_set: HashSet = HashSet::new(); + + for info in lsblk_info.iter() { + if info.file_system_type.is_some() { + let meta = std::fs::metadata(&info.path)?; + device_set.insert(meta.rdev()); + } + } + + Ok(device_set) +} + #[api()] #[derive(Debug, Serialize, Deserialize, PartialEq)] #[serde(rename_all="lowercase")] @@ -594,6 +616,8 @@ pub enum DiskUsageType { DeviceMapper, /// Disk has partitions Partitions, + /// Disk contains a file system label + FileSystem, } #[api( @@ -740,6 +764,8 @@ pub fn get_disks( let lvm_devices = get_lvm_devices(&lsblk_info)?; + let file_system_devices = get_file_system_devices(&lsblk_info)?; + // fixme: ceph journals/volumes let mut result = HashMap::new(); @@ -815,6 +841,10 @@ pub fn get_disks( }; } + if usage == DiskUsageType::Unused && file_system_devices.contains(&devnum) { + usage = DiskUsageType::FileSystem; + } + if usage == DiskUsageType::Unused && disk.has_holders()? { usage = DiskUsageType::DeviceMapper; }