tsarevvv/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tape: remove lazy_static dependency

Browse Source 
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
This commit is contained in:
Maximiliano Sandoval 2024-08-13 10:44:11 +02:00 committed by Wolfgang Bumiller
parent a480089bc9
commit 81b40e1421
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pbs-tape/Cargo.toml
View File

@ -4,13 +4,13 @@ version = "0.1.0"
authors.workspace = true authors.workspace = true
edition.workspace = true edition.workspace = true
description = "LTO tape support" description = "LTO tape support"
rust-version.workspace = true
[dependencies] [dependencies]
anyhow.workspace = true anyhow.workspace = true
bitflags.workspace = true bitflags.workspace = true
endian_trait.workspace = true endian_trait.workspace = true
hex.workspace = true hex.workspace = true
lazy_static.workspace = true
libc.workspace = true libc.workspace = true
log.workspace = true log.workspace = true
nix.workspace = true nix.workspace = true

7
pbs-tape/src/linux_list_drives.rs
View File

@ -3,6 +3,7 @@ use std::fs::{File, OpenOptions};
use std::os::unix::fs::OpenOptionsExt; use std::os::unix::fs::OpenOptionsExt;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::sync::LazyLock;
use anyhow::{bail, format_err, Error}; use anyhow::{bail, format_err, Error};
use nix::fcntl::{fcntl, FcntlArg, OFlag}; use nix::fcntl::{fcntl, FcntlArg, OFlag};
@ -12,10 +13,8 @@ use proxmox_sys::fs::scan_subdir;
use pbs_api_types::{DeviceKind, OptionalDeviceIdentification, TapeDeviceInfo}; use pbs_api_types::{DeviceKind, OptionalDeviceIdentification, TapeDeviceInfo};
lazy_static::lazy_static! { static SCSI_GENERIC_NAME_REGEX: LazyLock<regex::Regex> =
static ref SCSI_GENERIC_NAME_REGEX: regex::Regex = LazyLock::new(|| regex::Regex::new(r"^sg\d+$").unwrap());
regex::Regex::new(r"^sg\d+$").unwrap();
}
/// List linux tape changer devices /// List linux tape changer devices
pub fn linux_tape_changer_list() -> Vec<TapeDeviceInfo> { pub fn linux_tape_changer_list() -> Vec<TapeDeviceInfo> {

18
pbs-tape/src/sg_tape/mam.rs
View File

@ -1,5 +1,6 @@
use std::collections::HashMap; use std::collections::HashMap;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::sync::LazyLock;
use anyhow::{bail, format_err, Error}; use anyhow::{bail, format_err, Error};
use endian_trait::Endian; use endian_trait::Endian;
@ -114,18 +115,15 @@ static MAM_ATTRIBUTES: &[MamType] = &[
MamType::bin(0x10_01, 24, "Alternate Unique Cartridge Identify (Alt-UCI)"), MamType::bin(0x10_01, 24, "Alternate Unique Cartridge Identify (Alt-UCI)"),
]; ];
lazy_static::lazy_static! { static MAM_ATTRIBUTE_NAMES: LazyLock<HashMap<u16, &'static MamType>> = LazyLock::new(|| {
let mut map = HashMap::new();
static ref MAM_ATTRIBUTE_NAMES: HashMap<u16, &'static MamType> = { for entry in MAM_ATTRIBUTES {
let mut map = HashMap::new(); map.insert(entry.id, entry);
}
for entry in MAM_ATTRIBUTES { map
map.insert(entry.id, entry); });
}
map
};
}
fn read_tape_mam<F: AsRawFd>(file: &mut F) -> Result<Vec<u8>, Error> { fn read_tape_mam<F: AsRawFd>(file: &mut F) -> Result<Vec<u8>, Error> {
let alloc_len: u32 = 32 * 1024; let alloc_len: u32 = 32 * 1024;