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

src/tools/disks.rs: cleanup, remove unused DiskUse bitflag type

This commit is contained in:
Dietmar Maurer 2020-06-08 09:43:07 +02:00
parent d406de299b
commit bc853b028f
1 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/tools/disks.rs
View File

@ -8,7 +8,6 @@ use std::os::unix::fs::MetadataExt;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::sync::Arc; use std::sync::Arc;
use bitflags::bitflags;
use anyhow::{bail, format_err, Error}; use anyhow::{bail, format_err, Error};
use libc::dev_t; use libc::dev_t;
use once_cell::sync::OnceCell; use once_cell::sync::OnceCell;
@ -29,34 +28,15 @@ pub use lvm::*;
mod smart; mod smart;
pub use smart::*; pub use smart::*;
pub const SGDISK_BIN_PATH: &str = "/usr/sbin/sgdisk";
pub const LSBLK_BIN_PATH: &str = "/usr/bin/lsblk";
pub const BLOCKDEV_BIN_PATH: &str = "/sbin/blockdev";
lazy_static::lazy_static!{ lazy_static::lazy_static!{
static ref ISCSI_PATH_REGEX: regex::Regex = static ref ISCSI_PATH_REGEX: regex::Regex =
regex::Regex::new(r"host[^/]*/session[^/]*").unwrap(); regex::Regex::new(r"host[^/]*/session[^/]*").unwrap();
} }
bitflags! {
/// Ways a device is being used.
pub struct DiskUse: u32 {
/// Currently mounted.
const MOUNTED = 0x0000_0001;
/// Currently used as member of a device-mapper device.
const DEVICE_MAPPER = 0x0000_0002;
/// Contains partitions.
const PARTITIONS = 0x0001_0000;
/// The disk has a partition type which belongs to an LVM PV.
const LVM = 0x0002_0000;
/// The disk has a partition type which belongs to a zpool.
const ZFS = 0x0004_0000;
/// The disk is used by ceph.
const CEPH = 0x0008_0000;
}
}
/// Disk management context. /// Disk management context.
/// ///
/// This provides access to disk information with some caching for faster querying of multiple /// This provides access to disk information with some caching for faster querying of multiple
@ -544,8 +524,6 @@ pub struct BlockDevStat {
/// Use lsblk to read partition type uuids. /// Use lsblk to read partition type uuids.
pub fn get_partition_type_info() -> Result<HashMap<String, Vec<String>>, Error> { pub fn get_partition_type_info() -> Result<HashMap<String, Vec<String>>, Error> {
const LSBLK_BIN_PATH: &str = "/usr/bin/lsblk";
let mut command = std::process::Command::new(LSBLK_BIN_PATH); let mut command = std::process::Command::new(LSBLK_BIN_PATH);
command.args(&["--json", "-o", "path,parttype"]); command.args(&["--json", "-o", "path,parttype"]);
@ -842,8 +820,6 @@ pub fn get_disks(
/// Try to reload the partition table /// Try to reload the partition table
pub fn reread_partition_table(disk: &Disk) -> Result<(), Error> { pub fn reread_partition_table(disk: &Disk) -> Result<(), Error> {
const BLOCKDEV_BIN_PATH: &str = "/sbin/blockdev";
let disk_path = match disk.device_path() { let disk_path = match disk.device_path() {
Some(path) => path, Some(path) => path,
None => bail!("disk {:?} has no node in /dev", disk.syspath()), None => bail!("disk {:?} has no node in /dev", disk.syspath()),
@ -865,8 +841,6 @@ pub fn reread_partition_table(disk: &Disk) -> Result<(), Error> {
/// Initialize disk by writing a GPT partition table /// Initialize disk by writing a GPT partition table
pub fn inititialize_gpt_disk(disk: &Disk, uuid: Option<&str>) -> Result<(), Error> { pub fn inititialize_gpt_disk(disk: &Disk, uuid: Option<&str>) -> Result<(), Error> {
const SGDISK_BIN_PATH: &str = "/usr/sbin/sgdisk";
let disk_path = match disk.device_path() { let disk_path = match disk.device_path() {
Some(path) => path, Some(path) => path,
None => bail!("disk {:?} has no node in /dev", disk.syspath()), None => bail!("disk {:?} has no node in /dev", disk.syspath()),