Proxmox/proxmox
5
0
Fork 1
Code Issues Pull Requests Releases Activity

clippy 1.65 fixes

Browse Source 
and rustfmt

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2022-12-05 11:27:40 +01:00
parent 3193237afd
commit 1aa6f0ea22
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxmox-rrd/src/cache.rs
View File

@ -430,7 +430,7 @@ fn commit_journal_impl(
for rel_path in files.iter() {
let mut path = config.basedir.clone();
path.push(&rel_path);
path.push(rel_path);
fsync_file_or_dir(&path)
.map_err(|err| format_err!("fsync rrd file {} failed - {}", rel_path, err))?;
}

6
proxmox-rrd/src/rrd.rs
View File

@ -425,12 +425,12 @@ impl RRD {
options: CreateOptions,
avoid_page_cache: bool,
) -> Result<(), Error> {
let (fd, tmp_path) = make_tmp_file(&path, options)?;
let (fd, tmp_path) = make_tmp_file(path, options)?;
let mut file = unsafe { std::fs::File::from_raw_fd(fd.into_raw_fd()) };
let mut try_block = || -> Result<(), Error> {
let mut data: Vec<u8> = Vec::new();
data.extend(&PROXMOX_RRD_MAGIC_2_0);
data.extend(PROXMOX_RRD_MAGIC_2_0);
serde_cbor::to_writer(&mut data, self)?;
file.write_all(&data)?;
@ -454,7 +454,7 @@ impl RRD {
}
}
if let Err(err) = std::fs::rename(&tmp_path, &path) {
if let Err(err) = std::fs::rename(&tmp_path, path) {
let _ = nix::unistd::unlink(&tmp_path);
bail!("Atomic rename failed - {}", err);
}