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

tape: return current_file_number as u64

This commit is contained in:
Dietmar Maurer 2020-12-18 07:44:50 +01:00
parent 3e2984bcb9
commit 26aa9aca40
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tape/drive/linux_tape.rs
View File

@ -308,7 +308,7 @@ impl TapeDriver for LinuxTapeHandle {
Ok(()) Ok(())
} }
fn current_file_number(&mut self) -> Result<usize, Error> { fn current_file_number(&mut self) -> Result<u64, Error> {
let mut status = mtget::default(); let mut status = mtget::default();
self.mtnop()?; self.mtnop()?;
@ -320,7 +320,7 @@ impl TapeDriver for LinuxTapeHandle {
if status.mt_fileno < 0 { if status.mt_fileno < 0 {
bail!("current_file_number failed (got {})", status.mt_fileno); bail!("current_file_number failed (got {})", status.mt_fileno);
} }
Ok(status.mt_fileno as usize) Ok(status.mt_fileno as u64)
} }
fn erase_media(&mut self, fast: bool) -> Result<(), Error> { fn erase_media(&mut self, fast: bool) -> Result<(), Error> {

2
src/tape/drive/mod.rs
View File

@ -49,7 +49,7 @@ pub trait TapeDriver {
fn move_to_eom(&mut self) -> Result<(), Error>; fn move_to_eom(&mut self) -> Result<(), Error>;
/// Current file number /// Current file number
fn current_file_number(&mut self) -> Result<usize, Error>; fn current_file_number(&mut self) -> Result<u64, Error>;
/// Completely erase the media /// Completely erase the media
fn erase_media(&mut self, fast: bool) -> Result<(), Error>; fn erase_media(&mut self, fast: bool) -> Result<(), Error>;

4
src/tape/drive/virtual_tape.rs
View File

@ -167,12 +167,12 @@ impl TapeDriver for VirtualTapeHandle {
Ok(()) // do nothing for now Ok(()) // do nothing for now
} }
fn current_file_number(&mut self) -> Result<usize, Error> { fn current_file_number(&mut self) -> Result<u64, Error> {
let status = self.load_status() let status = self.load_status()
.map_err(|err| format_err!("current_file_number failed: {}", err.to_string()))?; .map_err(|err| format_err!("current_file_number failed: {}", err.to_string()))?;
match status.current_tape { match status.current_tape {
Some(VirtualTapeStatus { pos, .. }) => { Ok(pos)}, Some(VirtualTapeStatus { pos, .. }) => { Ok(pos as u64)},
None => bail!("current_file_number failed: drive is empty (no tape loaded)."), None => bail!("current_file_number failed: drive is empty (no tape loaded)."),
} }
} }