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

tape: avoid unneccessary SCSI request in Drop

Browse Source
This commit is contained in:
Dietmar Maurer 2021-04-08 11:26:08 +02:00
parent fad95a334a
commit 8204d9b095
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tape/drive/lto/sg_tape.rs
View File

@ -97,6 +97,7 @@ pub struct LtoTapeStatus {
pub struct SgTape { pub struct SgTape {
file: File, file: File,
info: InquiryInfo, info: InquiryInfo,
encryption_key_loaded: bool,
} }
impl SgTape { impl SgTape {
@ -113,7 +114,11 @@ impl SgTape {
if info.peripheral_type != 1 { if info.peripheral_type != 1 {
bail!("not a tape device (peripheral_type = {})", info.peripheral_type); bail!("not a tape device (peripheral_type = {})", info.peripheral_type);
} }
Ok(Self { file, info }) Ok(Self {
file,
info,
encryption_key_loaded: false,
})
} }
/// Access to file descriptor - useful for testing /// Access to file descriptor - useful for testing
@ -472,6 +477,9 @@ impl SgTape {
&mut self, &mut self,
key: Option<[u8; 32]>, key: Option<[u8; 32]>,
) -> Result<(), Error> { ) -> Result<(), Error> {
self.encryption_key_loaded = key.is_some();
set_encryption(&mut self.file, key) set_encryption(&mut self.file, key)
} }
@ -664,7 +672,9 @@ impl SgTape {
impl Drop for SgTape { impl Drop for SgTape {
fn drop(&mut self) { fn drop(&mut self) {
// For security reasons, clear the encryption key // For security reasons, clear the encryption key
let _ = self.set_encryption(None); if self.encryption_key_loaded {
let _ = self.set_encryption(None);
}
} }
} }